Distance calculations improved but still off.