Minor bugfixes

Version 0.03 (functional)