updated for latest maps, added cycling calories