changes to work on map.js from christina's work
merge conflicts fixed