Fixing Lats and Lons ordering
Fixing and polishing