Do some more documentation and improve help handling.

Change-Id: I0f2e792d698a4aba498c998010c572de2a3363da