Bugfixes + New grammar exercise