WIP PR: Suite of bug fixes

Fixes #55
Fixes #63