consistent use of colons in grammar - for #18
better use of \S for better (stricter) grammar - for #18
start of code for #19