Fixed some bugs in the grammar and trying to more support