Add an odometer to the mix.
Some minor bug fixes.