Cleanup and such

Fixes issues #2 and #1