Some cleanup in QuadTree, and work on Zone2D