some fixes.
Merge branch 'master' of https://github.com/davism4/fearmonger
did some stuff.
Merge branch 'master' of https://github.com/davism4/fearmonger