all non-py cmds added, py cmds stubbed, support for varied return codes