Continuing performance improvements. Still a bit laggy when zoomed out