add all missing commands, cleanup unneded stuff