Add some more commands, some reordering (sorry @dwfreed)