misc changes, fixed commands