Fix the usage help and lots of formatting fixes.