Optimize nonterminals, update readme and license