more pull request fixes
more pull request fixes

umts/umasstransit.rodeo,AkivaGreen/umasstransit.rodeo,umts/umasstransit.rodeo,AkivaGreen/umasstransit.rodeo,umts/umasstransit.rodeo,AkivaGreen/umasstransit.rodeo