diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 8222cb5..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore/.gitignore b/.gitignore
similarity index 91%
rename from .gitignore/.gitignore
rename to .gitignore
index 8bfaac4..02a8558 100644
--- a/.gitignore/.gitignore
+++ b/.gitignore
@@ -6,4 +6,4 @@
 .Spotlight-V100
 .Trashes
 ehthumbs.db
-Thumbs.db
+Thumbs.db
\ No newline at end of file
diff --git a/BowieLights.cpp b/BowieLights.cpp
index f344269..0b9830f 100644
--- a/BowieLights.cpp
+++ b/BowieLights.cpp
@@ -64,19 +64,24 @@ void BowieLights::dimLights() {
 }
 
 void BowieLights::setLight(uint8_t led_num, uint8_t val) {
-  if(led_num == 0) {
+  switch (led_num) {
+  case 0:
     analogWrite(BRIGHT_LED_FRONT_LEFT, val);
     led_val[0] = val;
-  } else if(led_num == 1) {
+    break;
+  case 1:
     analogWrite(BRIGHT_LED_FRONT_RIGHT, val);
     led_val[1] = val;
-  } else if(led_num == 2) {
+    break;
+  case 2:
     analogWrite(BRIGHT_LED_BACK_LEFT, val);
     led_val[2] = val;
-  } else if(led_num == 3) {
+    break;
+  case 3:
     analogWrite(BRIGHT_LED_BACK_RIGHT, val);
     led_val[3] = val;
-  } else if(led_num == 99) {
+    break;
+  case 99:
     analogWrite(BRIGHT_LED_FRONT_LEFT, val);
     analogWrite(BRIGHT_LED_BACK_LEFT, val);
     analogWrite(BRIGHT_LED_FRONT_RIGHT, val);
@@ -84,6 +89,10 @@ void BowieLights::setLight(uint8_t led_num, uint8_t val) {
     for(int i=0; i<4; i++) {
       led_val[i] = val;
     }
+    break;
+  default:
+    Serial.println("ERROR: Undefined led_num specified");
+    break;
   }
 }
 
diff --git a/BowieScoop.cpp b/BowieScoop.cpp
index 1f3c9e8..b3e60e1 100644
--- a/BowieScoop.cpp
+++ b/BowieScoop.cpp
@@ -52,8 +52,10 @@ void BowieScoop::servoInterruption(int key, int val) {
 void BowieScoop::updateScoopProbes() {
   scoop_probe_left_val = digitalRead(SCOOP_PROBE_LEFT);
   scoop_probe_right_val = digitalRead(SCOOP_PROBE_RIGHT);
-  //Serial << "Scoop probes- L: " << scoop_probe_left_val;
-  //Serial << "Scoop probes- R: " << scoop_probe_right_val << endl;
+  #ifdef SERVO_DEBUG:
+    Serial << "Scoop probes- L: " << scoop_probe_left_val;
+    Serial << "Scoop probes- R: " << scoop_probe_right_val << endl;
+  #endif
 }
 
 bool BowieScoop::getScoopProbeL() {
@@ -80,7 +82,9 @@ void BowieScoop::moveEnd(int endPos, int step, int del) {
   int prev_pos = getEndPos();
   if(prev_pos > endPos) { // going towards END_MIN
     for(int i=prev_pos; i>endPos; i-=step) {
-      //Serial << "S" << i << endl;
+      #ifdef SERVO_DEBUG
+        Serial << "S" << i << endl;
+      #endif
       scoop.writeMicroseconds(i);
       end_position = i;
       delay(del);
@@ -88,7 +92,9 @@ void BowieScoop::moveEnd(int endPos, int step, int del) {
     }
   } else if(prev_pos <= endPos) { // going towards END_MAX
     for(int i=prev_pos; i<endPos; i+=step) {
-      //Serial << "S" << i << endl;
+      #ifdef SERVO_DEBUG
+        Serial << "S" << i << endl;
+      #endif
       scoop.writeMicroseconds(i);
       end_position = i;
       delay(del);
diff --git a/BowieScoop.h b/BowieScoop.h
index c10e1be..bba5d61 100644
--- a/BowieScoop.h
+++ b/BowieScoop.h
@@ -26,6 +26,9 @@
 #ifndef _BOWIESCOOP_H_
 #define _BOWIESCOOP_H_
 
+// optional servo positional debugging
+#define SERVO_DEBUG False
+
 // Servo positions
 #define END_MIN 700 // up
 #define END_PARALLEL_TOP 2300 // parallel to ground when arm is raised, raised a bit to keep debris in