Fixing usage ordering and ensuring help works.