Small bugfix and some minor tweaks on the Grammar