Bugfixes -hopefully-
Merge branch 'master' of github.com:jeffreyrack/hodor
Fix some bugs