Various fixes

* Fixed #11 (to an extent!)
* Potential fix for #12