Minor additions and fixes to grammar elements
Renamed Parser to SRParser (shift-reduce)