command help update and fixer minor refactoring