Fix bugs and clean up.
First pass at generating HTML file for CLI commands.
Slightly nicer template.