(almost) full grammar support, fix