Fixed a bunch of bork.
Merge branch 'master' of github.com:leechfarm/whut