Changes to trie class
Other changes
merge