overhaul of command parser, broke most commands