Tweaks, better comments, removing cruft
Adjust tests for geo tiles