       lcd.print("         "); // Clear the extra chars
     }
 #else // #ifndef CONVERT_TO_LOCAL
-#ifdef DISPLAY_HDOP_ERROR
+#ifdef DISPLAY_HDOP
     // Display Horizontal Dilution of Precision (Hdop) with the format X.X
     // It comes in from the GPS module as XXX
     // If you care how Hdop is computed (I don't :-(), see the following:
     // http://www2.unb.ca/gge/Resources/gpsworld.may99.pdf
-    float Hdop = (float)GPSData.hdop / 100.0f; // In X.X format
+    float Hdop = (float)GPSData.hdop / 100.0f; // Hdop in X.X format
     lcd.print(" Hdop:");
     if (Hdop < 10.0f) {
       lcd.print(Hdop);

        } // if (hdopToggle)
      } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
    } // if (hError < 100.0f)
#endif // #ifdef DISPLAY_HDOP_ERROR
#endif // #ifndef CONVERT_TO_LOCAL
    lcd.setCursor (0, 2); // Go to 3rd line
    lcd.print("Spd: ");

          lcd.print("   ");
        } // if (hdopToggle)
      } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
    } // if (Hdop < 10.0f)
#else // #ifdef DISPLAY_HDOP
    // Display horizontal position error in feet
    float hError = (float)GPSData.hdop / 100.0f; // Error in X.X format
    hError *= GPS_RECEIVER_ERROR; // Error in meters
    hError *= _GPS_FEET_PER_METER; // Error in feet
    lcd.print(" Err: ");
    if (hError < 100.0f) {
      lcd.print((uint8_t)hError);
      if (hError < 10.0f) {
        lcd.print("f "); // feet
      }
      else {
        lcd.print("f"); // feet
      }
    }
    else { // if (hError < 100.0f)
      // horizontal position error value too large for my LCD, so cross it out
      // Toggle Hdop indicator every TOGGLETIME_INTERVAL seconds
      if (now - prevHdopTime > TOGGLETIME_INTERVAL / 3) {
