some fixes in grammar