Improvements in a bunch of places.

but BPlusTree still broken.