Fixed a bunch of crap
Merge branch 'master' of github.com:ace6598/ruhunt