finished map and added comments functionality