Improved unit picker.

Updated distances to more recent data.