Clean up some things
Fixing some issues #50