More fleshing out of EBNF of commands