Add help messages, minor tidy up.

Retest some functionality to ensure works