Did a bunch more splay tree stuff