diff --git a/src/monocoque/devices/serial/arduino.c b/src/monocoque/devices/serial/arduino.c
index 1efc585..ce0ab90 100644
--- a/src/monocoque/devices/serial/arduino.c
+++ b/src/monocoque/devices/serial/arduino.c
@@ -48,18 +48,18 @@ int arduino_init(SerialDevice* serialdevice, const char* portdev)
     int error = 0;
     char* port_name = strdup(portdev);
 
-    slogd("Looking for port %s.\n", port_name);
+    slogd("Looking for port %s", port_name);
     error = check(sp_get_port_by_name(port_name, &serialdevice->port));
     if (error != 0)
     {
         return error;
     }
 
-    slogd("Opening port.\n");
+    slogd("Opening port");
     check(sp_open(serialdevice->port, SP_MODE_READ_WRITE));
 
-    slogd("Setting port to %i 8N1, no flow control", serialdevice->baud);
-    check(sp_set_baudrate(serialdevice->port, serialdevice->baud));
+    slogd("Setting port to %i 8N1, no flow control", serialdevice->baudrate);
+    check(sp_set_baudrate(serialdevice->port, serialdevice->baudrate));
     check(sp_set_bits(serialdevice->port, 8));
     check(sp_set_parity(serialdevice->port, SP_PARITY_NONE));
     check(sp_set_stopbits(serialdevice->port, 1));
diff --git a/src/monocoque/devices/serialdevice.c b/src/monocoque/devices/serialdevice.c
index 5d943c0..8bb45c7 100644
--- a/src/monocoque/devices/serialdevice.c
+++ b/src/monocoque/devices/serialdevice.c
@@ -133,7 +133,7 @@ int serialdev_free(SimDevice* this)
 
 int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
 {
-    slogi("initializing serial device on port %s...", ds->serialdevsettings.portdev);
+    slogi("initializing serial device on port %s to %i...", ds->serialdevsettings.portdev, ds->serialdevsettings.baud);
     int error = 0;
 
 
@@ -142,15 +142,16 @@ int serialdev_init(SerialDevice* serialdevice, DeviceSettings* ds)
 
     switch (serialdevice->type)
     {
-    case SERIALDEV_WHEEL:
+        case SERIALDEV_WHEEL:
 
-        // the wheel stuff assumed it was a usb
-        //error = wheeldev_init(&serialdevice->u.wheeldevice, ds);
-        error = moza_init(serialdevice, ds->serialdevsettings.portdev);
-        break;
+            // the wheel stuff assumed it was a usb
+            //error = wheeldev_init(&serialdevice->u.wheeldevice, ds);
+            error = moza_init(serialdevice, ds->serialdevsettings.portdev);
+            break;
 
-    default:
-        error = arduino_init(serialdevice, ds->serialdevsettings.portdev );
+        default:
+            error = arduino_init(serialdevice, ds->serialdevsettings.portdev );
+            break;
     }
 
 
diff --git a/src/monocoque/devices/simdevice.h b/src/monocoque/devices/simdevice.h
index a545491..c0551b1 100644
--- a/src/monocoque/devices/simdevice.h
+++ b/src/monocoque/devices/simdevice.h
@@ -48,7 +48,6 @@ typedef struct
     int id;
     SerialType type;
     struct sp_port* port;
-    int baud;
     SerialDeviceType devicetype;
     // move these two they only apply to the haptic device
     int motorsposition;