Final Fix

But the X/Y to Lat/Lon is a bit fucked up.