Misc updates. Still working through SplayTree performance issues on contains.