more fixups to rbtree