Updates to Map Gen logic