Add cmds and fix commands