Fixes

Fixes #66 
Fixes #65 
Idk, it's just a personal thing - I don't really care either way though. I'll remove them :)