Bugfixes

Closes #167
Closes #165