add gmap link
cleanup merge