Skip to content

Fixes and cleanup

Fixes and cleanup #24