Added map naming ability, rebuilt editMap()