Make miles singular if it's only 1 mile.
Fix some new duration/distance stuff and reorganize them.

Also not use strlen.