made a few minor Map code improvements