Skip to content

Fixes and refactor

Fixes and refactor #6