comment indentation
some updates to grammar to better reflect current parser