And more changes

All distances calculated perfectly