grammar: integrated configuration values into rules
grammar: added comments into acceptable whitespace