arrange all of @moly fixes to inefficent quadtree and minor formatting cleanup