Fixed bug in grammar. For #37
Fixes/tweaks to parser/grammar changes. For #37