Add some references to the help
Merge remote-tracking branch 'blueyed/doc-fixes'