Skip to content

Fixes and updates

Fixes and updates #303