fixed commands
small fixes
Merge branch 'mitch'