Command cleanup and typo fix.