Added new preference to emphasize route number.
Cleanup; fix issue #14 and issue #10.