A lot of BinTree corrections