A bunch of changes to maps