Grammar fixed up, many dictionary optimizations and features synchronized