added CTrie, bugfixes for collisions for HAMT and refactorings