Minor improvements on timing
Fix missing quadtree cases - thanks to Stephen Ingram