fix a couple issues
Merge branch 'master' of https://github.com/OOKB/huntingground