Fixed up map with new changes, woohoo!