Smal adjustment
Fixes to scale and distance calculation
Improvements to scale display