Grammar fixes to reduce ambiguity; added highlighting for detected commands