Fix some small issues

Fixes #55 
Fixes #50 
Fixes #49