Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2b2959ec969dc53b7a097c27702bbd1a873473d1 -r402636af453fc93987b34beec66a41bfa113e00c
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2b2959ec969dc53b7a097c27702bbd1a873473d1)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 402636af453fc93987b34beec66a41bfa113e00c)
@@ -34,6 +34,8 @@
 button.edit  =Edit
 button.remove  =Remove
 
+label.learner.markerLimitReached  =You have reached the marker limit, you cannot add any more.
+
 advanced.editingOptions  =Editing Options
 advanced.lockOnFinished  =Lock when finished
 advanced.allowEditMarkers  =Allow learners to edit their own saved markers
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java
===================================================================
diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r402636af453fc93987b34beec66a41bfa113e00c
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/servlets/ExportServlet.java	(.../ExportServlet.java)	(revision 402636af453fc93987b34beec66a41bfa113e00c)
@@ -125,36 +125,34 @@
 			throw new GmapException(error);
 		}
 
-		GmapSession gmapSession = gmapService
-				.getSessionBySessionId(toolSessionID);
+		GmapSession gmapSession = gmapService.getSessionBySessionId(toolSessionID);
 
 		Gmap gmap = gmapSession.getGmap();
 
-		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession()
-				.getAttribute(AttributeNames.USER);
+		UserDTO lamsUserDTO = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
-		GmapUser gmapUser = gmapService
-				.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),
-						toolSessionID);
+		GmapUser gmapUser = gmapService.getUserByUserIdAndSessionId(new Long(lamsUserDTO.getUserID()),toolSessionID);
 
-		NotebookEntry gmapEntry = gmapService.getEntry(gmapUser
-				.getEntryUID());
+		//NotebookEntry gmapEntry = gmapService.getEntry(gmapUser.getEntryUID());
 
 		// construct dto's
-		GmapDTO gmapDTO = new GmapDTO();
-		gmapDTO.setTitle(gmap.getTitle());
-		gmapDTO.setInstructions(gmap.getInstructions());
+		GmapDTO gmapDTO = new GmapDTO(gmap);
+		//GmapDTO gmapDTO = new GmapDTO();
+		//gmapDTO.setTitle(gmap.getTitle());
+		//gmapDTO.setInstructions(gmap.getInstructions());
 
 		GmapSessionDTO sessionDTO = new GmapSessionDTO();
 		sessionDTO.setSessionName(gmapSession.getSessionName());
 		sessionDTO.setSessionID(gmapSession.getSessionId());
+		sessionDTO.setUserDTOs(gmapSession.getGmapUsers());
 
 		// If the user hasn't put in their entry yet, gmapEntry will be null;
-		GmapUserDTO userDTO = gmapEntry != null 
-			? new GmapUserDTO(gmapUser,gmapEntry) 
-			: new GmapUserDTO(gmapUser);
+		//GmapUserDTO userDTO = gmapEntry != null ? new GmapUserDTO(gmapUser,gmapEntry) : new GmapUserDTO(gmapUser);
 
-		sessionDTO.getUserDTOs().add(userDTO);
+		//GmapUserDTO userDTO = new GmapUserDTO(gmapUser);
+		
+		
+		//sessionDTO.getUserDTOs().add(userDTO);
 		gmapDTO.getSessionDTOs().add(sessionDTO);
 
 		request.getSession().setAttribute("gmapDTO", gmapDTO);