Added CLI help.
Whitespace cleanup.
Manually fixing merge conflicts