fixed more map bugs