Minor tweaks on the RTree, started cleaning up some code.