navigation fixes + map locations