Fixed some bugs and made some more changes to the grammar.