Fixed remaining errors - grammar now LL(1) (#17)