Fixed up usage and help formatting and removed cruft.