first iteration of grammar seems to be fixed.