Various minor fixes
Merge branch 'master' of https://github.com/habitathalton/hfh