spec updates and grammar updates for additional keywords