some keyword and identifier handling
small grammar fix