Minor mods to astar, map, and readmap