fix up bike and walk leg -- refactor common code, etc...