diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d1df0fb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# Ignore libraries added using Arduino IDE Library Manager
+RadioLib/
+ArduinoJson/
+
+# Ignore Emacs backup files
+*~
\ No newline at end of file
diff --git a/CubeSatLib_Actuators/basedrive.cpp b/CubeSatLib_Actuators/basedrive.cpp
index 8726057..f1964d4 100644
--- a/CubeSatLib_Actuators/basedrive.cpp
+++ b/CubeSatLib_Actuators/basedrive.cpp
@@ -1,5 +1,5 @@
 #include "basedrive.h"
-#include <arduino.h>
+#include <Arduino.h>
 #include "consoleio.h"
 
 int CBaseDrive::channel=0;
@@ -110,4 +110,4 @@ void CBaseDrive::callNewFunction(CMsg &msg){   //Calls a specific function direc
   if (act=="STOP") stopActuator();
   if (act=="SPEED") Speed(speed,duration);
   if (act=="START") Forward(speed,duration);
-}
\ No newline at end of file
+}
diff --git a/CubeSatLib_Actuators/fhmotor.cpp b/CubeSatLib_Actuators/fhmotor.cpp
index 9622521..fcd93bb 100644
--- a/CubeSatLib_Actuators/fhmotor.cpp
+++ b/CubeSatLib_Actuators/fhmotor.cpp
@@ -1,6 +1,6 @@
 #include "fhmotor.h"
 #include <consoleio.h>
-#include <arduino.h>
+#include <Arduino.h>
 
 volatile unsigned long _countx=0;
 volatile unsigned long _county=0;
@@ -185,12 +185,12 @@ void CMotorController::activateDrive(float val){
   setMSpeed(val);
   int nVal;
   
-  if((val<0)&&(getDir()){
+  if((val<0)&&(getDir())){
     setDir(0);              
     digitalWrite(PIN_DIR,LOW);  
   }
 
-  if((val>=0)&&(!getDir()){  
+  if((val>=0)&&(!getDir())){  
     setDir(1);
     digitalWrite(PIN_DIR,HIGH);
   }
diff --git a/CubeSatLib_Actuators/fhmotor.h b/CubeSatLib_Actuators/fhmotor.h
index 2b56be5..d81d0d7 100644
--- a/CubeSatLib_Actuators/fhmotor.h
+++ b/CubeSatLib_Actuators/fhmotor.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <defs.h>
 #include "basedrive.h"
-#include <arduino.h>
+#include <Arduino.h>
 #include "consoleio.h"
 #include "system_imu.h"
-#include "PID1.h"
+#include "pid1.h"
 
 
 #if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
@@ -12,7 +12,7 @@
  //#include <PwmOut.h>
 using namespace mbed;
 #else
-//#include <arduino.h>
+//#include <Arduino.h>
 typedef int PinName; 
 #endif
 
diff --git a/CubeSatLib_Actuators/pid1.cpp b/CubeSatLib_Actuators/pid1.cpp
index 7539c9a..363cb1f 100644
--- a/CubeSatLib_Actuators/pid1.cpp
+++ b/CubeSatLib_Actuators/pid1.cpp
@@ -11,7 +11,7 @@
   #include "WProgram.h"
 #endif
 
-#include "PID1.h"
+#include "pid1.h"
 
 /*Constructor (...)*********************************************************
  *    The parameters specified here are those for for which we can't set up
diff --git a/CubeSatLib_Actuators/pwmpin.h b/CubeSatLib_Actuators/pwmpin.h
index 9c7d406..2f3797b 100644
--- a/CubeSatLib_Actuators/pwmpin.h
+++ b/CubeSatLib_Actuators/pwmpin.h
@@ -1,14 +1,14 @@
 #pragma once
 #include <defs.h>
 #include "basedrive.h"
-#include <arduino.h>
+#include <Arduino.h>
 #include "consoleio.h"
 #if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
  // #include <mbed.h>
   #include <PwmOut.h>
 using namespace mbed;
 #else
-//#include <arduino.h>
+//#include <Arduino.h>
 typedef int PinName; 
 #endif
 
diff --git a/CubeSatLib_All/ceps.cpp b/CubeSatLib_All/ceps.cpp
index 999d9de..665e462 100644
--- a/CubeSatLib_All/ceps.cpp
+++ b/CubeSatLib_All/ceps.cpp
@@ -1,4 +1,4 @@
-#include "arduino.h"
+#include "Arduino.h"
  #include <Wire.h>
 #include "ceps.h"
 
@@ -19,7 +19,7 @@ uint8_t  CEPS::readI2C(uint8_t i2cs_addr, uint8_t reg, uint8_t * data, uint16_t
   Wire.beginTransmission(i2cs_addr);
   Wire.write(&reg,1);
   Wire.endTransmission();
-  Wire.requestFrom(i2cs_addr, nbyte);    // request 6 bytes from slave device #8
+  Wire.requestFrom(i2cs_addr, (uint8_t) nbyte);    // request 6 bytes from slave device #8
 
   uint16_t k = 0;
   //writeconsole("Available :"); writeconsoleln(Wire.available());
diff --git a/CubeSatLib_All/consoleio.cpp b/CubeSatLib_All/consoleio.cpp
index f0d0ae6..f7ff02e 100644
--- a/CubeSatLib_All/consoleio.cpp
+++ b/CubeSatLib_All/consoleio.cpp
@@ -1,7 +1,7 @@
 #include "defs.h"
 #include "funcs.h"
 #include "consoleio.h"
-#include <arduino.h>
+#include <Arduino.h>
 
 std::list<std::string> qLog;
 
diff --git a/CubeSatLib_All/funcs.cpp b/CubeSatLib_All/funcs.cpp
index 9ae0b42..3abf6d8 100644
--- a/CubeSatLib_All/funcs.cpp
+++ b/CubeSatLib_All/funcs.cpp
@@ -1,5 +1,5 @@
 #include "funcs.h"
-#include "arduino.h"
+#include "Arduino.h"
 
 long getTime() {
   return millis();
diff --git a/CubeSatLib_All/messages.cpp b/CubeSatLib_All/messages.cpp
index 4383695..e5e0821 100644
--- a/CubeSatLib_All/messages.cpp
+++ b/CubeSatLib_All/messages.cpp
@@ -1,6 +1,6 @@
 #include "messages.h"
 #include "consoleio.h"
-#include <arduino.h>
+#include <Arduino.h>
 
 
 
diff --git a/CubeSatLib_All/msg.cpp b/CubeSatLib_All/msg.cpp
index 0013de2..5111fa6 100644
--- a/CubeSatLib_All/msg.cpp
+++ b/CubeSatLib_All/msg.cpp
@@ -1,6 +1,6 @@
 #include "msg.h"
 #include "consoleio.h"
-#include <arduino.h>
+#include <Arduino.h>
 
 int CMsg::_ID = 0;
 
@@ -180,4 +180,4 @@ for (auto it = Parameters.begin(); it != Parameters.end(); ++it) {
     Parameters.erase(it);   //Check to make sure this works			 
   }
   }				
-}
\ No newline at end of file
+}
diff --git a/CubeSatLib_All/phone.h b/CubeSatLib_All/phone.h
index 6505439..d314a32 100644
--- a/CubeSatLib_All/phone.h
+++ b/CubeSatLib_All/phone.h
@@ -5,7 +5,7 @@
 #include <queue>
 #include "funcs.h"
 
-#include <arduino.h>
+#include <Arduino.h>
 
 #define BLOCK_LENGTH 200
 #define BUFFER_LENGTH 50
diff --git a/CubeSatLib_All/powerup.cpp b/CubeSatLib_All/powerup.cpp
index 142bf4b..2b48ab5 100644
--- a/CubeSatLib_All/powerup.cpp
+++ b/CubeSatLib_All/powerup.cpp
@@ -1,7 +1,7 @@
 #include "defs.h"
 #include "powerup.h"
 
-#include "arduino.h"
+#include "Arduino.h"
 
 #if defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_PORTENTA_H7_M7)
 
diff --git a/CubeSatLib_All/system_mgr.h b/CubeSatLib_All/system_mgr.h
index 22afaf4..6452835 100644
--- a/CubeSatLib_All/system_mgr.h
+++ b/CubeSatLib_All/system_mgr.h
@@ -7,7 +7,7 @@
 #include <fhmotor.h>
 #include "SparkFun_BNO080_Arduino_Library.h"
 #include <radio.h>
-#include <arduino.h>
+#include <Arduino.h>
 
 #include <string>
 #include <mdrive.h>
diff --git a/CubeSatLib_All/system_pins.cpp b/CubeSatLib_All/system_pins.cpp
index 6190149..88ad946 100644
--- a/CubeSatLib_All/system_pins.cpp
+++ b/CubeSatLib_All/system_pins.cpp
@@ -1,5 +1,5 @@
 #include "system_pins.h"
-#include <arduino.h>
+#include <Arduino.h>
 
 void CSatPins::loop() {
 }
@@ -129,4 +129,4 @@ void  CSatPins::callCustomFunctions(CMsg &msg){
   if(act=="HIGH") high(msg);
   if(act=="LOW") low(msg);
   if(act=="PWM") pwm(msg);
-}
\ No newline at end of file
+}
diff --git a/CubeSatLib_All/systemobject.cpp b/CubeSatLib_All/systemobject.cpp
index eb9b76c..46e6cb0 100644
--- a/CubeSatLib_All/systemobject.cpp
+++ b/CubeSatLib_All/systemobject.cpp
@@ -1,7 +1,7 @@
 
 #include "systemobject.h"
 #include "messages.h"
-#include <arduino.h>
+#include <Arduino.h>
 //stateNone->switchOn()->stateOn|StateError
 //stateOn->setup()->->stateReady|StateError
 //stateReady->switchPlay()->statePlay|StateError
@@ -411,4 +411,4 @@ int CSystemObject::subscribers(std::string str){
     CMessages* pM = getMessages();  
     pM->addReceivedList(m);
 
-  }
\ No newline at end of file
+  }
diff --git a/CubeSatLib_All/systemobject.h b/CubeSatLib_All/systemobject.h
index d61fb1d..57eb997 100644
--- a/CubeSatLib_All/systemobject.h
+++ b/CubeSatLib_All/systemobject.h
@@ -10,7 +10,7 @@
  TwoWire *getWire2();
 using namespace mbed;
 #else
-//#include <arduino.h>
+//#include <Arduino.h>
 typedef int PinName; 
 #endif