Removed every other layer from the quadtree.
A bit of inlining.
Minor changes.
Merge commit '486289d'