Minor help and bug fixes.
Merge branch 'master' of https://github.com/d4t4king/flaming-octo-dangerzone