Skip to content

Multiple fixes

Multiple fixes #26