changes based on gmap syntax change, plus moar aliases, natch