Clean up range logic
Fix reverse lookup of coordinates for axis-broken