Reorder methods, minor reformatting before next round of real changes [1074]
Implements hi-pri (starred) Enhancement #3 [1074]
Fixes hi-pri bug #11 (display removal remnants) [1074]
Enhancement #22 (GEO label decluttering) [1074]