Some minor changes, and minor map changes