Performance increase on MapCell selection. O(n) -> O(1). Refactored for clarity. Cleaned up some mess from last night.