fix some bugs in grammar + adding more parsing tree