diff --git a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
index 863359556..8d7778e76 100644
--- a/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
+++ b/Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
@@ -39,11 +39,11 @@ public class Camera {
 	}
 
 	public Camera(String cameraName, double fov) {
-		this(CameraManager.AllUsbCameraInfosByName.get(cameraName), fov);
+		this(cameraName,CameraManager.AllUsbCameraInfosByName.get(cameraName), fov);
 	}
 
-	public Camera(UsbCameraInfo usbCamInfo, double fov) {
-		this(usbCamInfo, fov, new HashMap<>(), 0);
+	public Camera(String cameraName, UsbCameraInfo usbCamInfo, double fov) {
+		this(cameraName ,usbCamInfo, fov, new HashMap<>(), 0);
 	}
 
 	public Camera(String cameraName, double fov, int videoModeIndex) {
@@ -51,12 +51,12 @@ public class Camera {
 	}
 
 	public Camera(String cameraName, double fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
-		this(CameraManager.AllUsbCameraInfosByName.get(cameraName), fov, pipelines, videoModeIndex);
+		this(cameraName, CameraManager.AllUsbCameraInfosByName.get(cameraName), fov, pipelines, videoModeIndex);
 	}
 
-	public Camera(UsbCameraInfo usbCamInfo, double fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
+	public Camera(String cameraName, UsbCameraInfo usbCamInfo, double fov, HashMap<Integer, Pipeline> pipelines, int videoModeIndex) {
 		FOV = fov;
-		name = usbCamInfo.name;
+		name = cameraName;
 		path = usbCamInfo.path;
 
 		UsbCam = new UsbCamera(name, path);
diff --git a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
index c60c6c37a..ec09f6afd 100644
--- a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
@@ -228,8 +228,8 @@ public class VisionProcess implements Runnable {
 				lastFrameEndNanosec = System.nanoTime();
 				processTimeMs = (lastFrameEndNanosec - startTime) * 1e-6;
 				fps = 1000 / processTimeMs;
-
-				System.out.printf("%s - Process time: %-5.2fms, FPS: %-5.2f, FoundContours: %d, FilteredContours: %d, GroupedContours: %d\n", cameraName, processTimeMs, fps, FoundContours.size(), FilteredContours.size(), GroupedContours.size());
+				//please dont enable if you are not debugging
+				//				System.out.printf("%s - Process time: %-5.2fms, FPS: %-5.2f, FoundContours: %d, FilteredContours: %d, GroupedContours: %d\n", cameraName, processTimeMs, fps, FoundContours.size(), FilteredContours.size(), GroupedContours.size());
 			}
 		}
 	}
diff --git a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
index e26058cde..28ecca5d8 100644
--- a/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
+++ b/Main/src/main/java/com/chameleonvision/web/ServerHandler.java
@@ -84,7 +84,9 @@ public class ServerHandler {
                     String newCamera = (String) value;
                     System.out.printf("Changing camera to %s\n", newCamera);
                     CameraManager.setCurrentCamera(newCamera);
-                    broadcastMessage(new HashMap<String, Object>(){}.put("port", CameraManager.getCurrentCamera().getStreamPort()));
+                    HashMap<String,Integer> portMap = new HashMap<String, Integer>();
+                    portMap.put("port",CameraManager.getCurrentCamera().getStreamPort());
+                    broadcastMessage(portMap);
                     broadcastMessage(CameraManager.getCurrentCamera()); //TODO CHECK JSON FOR CAMERA CHANGE
                     break;
                 case "curr_pipeline":