diff --git a/Firmware/OpeNITHM/AirSensor.cpp b/Firmware/OpeNITHM/AirSensor.cpp
index 9001c5a..e08c61d 100644
--- a/Firmware/OpeNITHM/AirSensor.cpp
+++ b/Firmware/OpeNITHM/AirSensor.cpp
@@ -287,12 +287,15 @@ void AirSensor::analogCalibrate()
       setHalfLEDs(CRGB::Green, side);
       delay(3000);
       inputDetected = false;
+      for (int j = 0; j < 6; j++) lastReadings[j] = 0;
     }
     
     saveConfig();
   }
   else 
   {
+    loadConfig();
+    
     for (int i = 0; i < 6; i++) 
     {
       // just set the keys to calibrated
diff --git a/Firmware/OpeNITHM/OpeNITHM.ino b/Firmware/OpeNITHM/OpeNITHM.ino
index 273c551..ec419f4 100644
--- a/Firmware/OpeNITHM/OpeNITHM.ino
+++ b/Firmware/OpeNITHM/OpeNITHM.ino
@@ -105,7 +105,7 @@ void initializeController() {
 
   // Initialize air sensor
   if (sensor != NULL) delete sensor;
-  sensor = new AirSensor(2000, 200);
+  sensor = new AirSensor(1000, 200);
 
   // Display the number of air sensors that were calibrated
   for (CRGB& led : leds)
@@ -164,7 +164,7 @@ void checkPollRate() {
 
 void loop() {
   // Uncomment this code to see benchmark in serial (in Hz)
-  // checkPollRate();
+  checkPollRate();
   
   // Check for serial messages
   if (Serial.available() >= 100)