Fixes #34, and more