Switched coords and conversions

Now checking for switched coords
Coordinate conversions