Fixed a few issues with the grammar