Btree, and a few changes