diff --git a/client/src/main/java/me/retrodaredevil/solarthing/analytics/RoverAnalyticsHandler.java b/client/src/main/java/me/retrodaredevil/solarthing/analytics/RoverAnalyticsHandler.java
index 1effcc26..9984cd3e 100644
--- a/client/src/main/java/me/retrodaredevil/solarthing/analytics/RoverAnalyticsHandler.java
+++ b/client/src/main/java/me/retrodaredevil/solarthing/analytics/RoverAnalyticsHandler.java
@@ -28,12 +28,11 @@ private void send(PacketCollection packetCollection) {
 		for (Packet packet : packetCollection.getPackets()) {
 			if (packet instanceof RoverStatusPacket) {
 				RoverStatusPacket rover = (RoverStatusPacket) packet;
-				String data = rover.getProductModel() + "," + rover.getRatedChargingCurrentValue();
+				String data = "(" + rover.getNumber() + ") " + rover.getProductModel() + "," + rover.getRatedChargingCurrentValue();
 				if (!rover.supportsMesLoad()) {
 					data += ",no MES Load";
 				}
 				analyticsManager.sendRoverStatus(data, timer.getUptimeHours());
-				return;
 			}
 		}
 	}
diff --git a/client/src/main/java/me/retrodaredevil/solarthing/program/OutbackMateMain.java b/client/src/main/java/me/retrodaredevil/solarthing/program/OutbackMateMain.java
index 742bb625..1ade71a6 100644
--- a/client/src/main/java/me/retrodaredevil/solarthing/program/OutbackMateMain.java
+++ b/client/src/main/java/me/retrodaredevil/solarthing/program/OutbackMateMain.java
@@ -68,7 +68,6 @@ public static int connectMate(MateProgramOptions options, File dataDirectory) th
 		LOGGER.debug("IO Bundle File: " + options.getIOBundleFile());
 		try(IOBundle io = createIOBundle(options)) {
 
-			// TODO mate analytics
 			EnvironmentUpdater[] environmentUpdaterReference = new EnvironmentUpdater[1];
 			PacketHandlerInit.Result handlersResult = PacketHandlerInit.initHandlers(
 					options,