Feature/smallfixes

Addresses #5 and #4