Reverted screwups to command parser