tweaks to command parsing.