Some small in progress changes to maps