Skip to content

Misc bug fixes

Misc bug fixes #24