Fixes #5 and other crap