First rough draft on jump correction.
Minor cleanup
Merge branch 'hannu'
More git cleanup
And still bit more cleanup.