Fix numerous nits, add some help capabilities.