diff --git a/HotWaterManager.h b/HotWaterManager.h
index 0dfb810..0cdd259 100644
--- a/HotWaterManager.h
+++ b/HotWaterManager.h
@@ -1,21 +1,15 @@
 // ****** Hardware Model definitions ********
 
-// Do not change these definitions! The numerical order is important!
-#define ARDUINO_            0
-#define HWV_1_0             1
-#define HWV_1_1             2
-#define HWV_1_2             3
+#define ARDUINO_            0                               // Use this one if you want to build this project around an Arduino
+#define HWV_1_0             1                               // Hardware version 1.0 of the Thermal Optimizer board (only a few were made)
+#define HWV_1_1             2                               // Hardware version 1.1 of the Thermal Optimizer board
+#define HWV_1_2             3                               // Hardware version 1.2 of the Thermal Optimizer board
 
 // ********* Hardware Model ************
-// Uncomment ONE of the following:
-#define HWMODEL             ARDUINO_                        // Use this one if you want to build this project around an Arduino
-//#define HWMODEL             HWV_1_0                        // Use this one if you want to build this project for a ThermalOptimizer board v1.0
-//#define HWMODEL             HWV_1_1                        // Use this one if you want to build this project for a ThermalOptimizer board v1.1
-//#define HWMODEL             HWV_1_2                        // Use this one if you want to build this project for a ThermalOptimizer board v1.2
+#define HWMODEL             ARDUINO_                        // Change this into the hardware model you want to compile for
 
-// ******** Debug definitions **********
-// Leave commented for production!
-//#define SIMTEMP               683                         // Use this to test the program without actual temperature sensors connected. 683 simulates 68.3 Celcius
+// Debug definitions, leave commented for production!
+//#define SIMTEMP               713                         // Use this to test the program without actual temperature sensors connected. 713 simulates 71.3 Celcius
 //#define SIMVOLT               141                         // Use this to test the program for a specific voltage. 141 simulates 14.1
 //#define USEDEFAULT            1                           // declutter the EPROM, use the defaults
 
diff --git a/HotWaterManager.ino b/HotWaterManager.ino
index d934afa..b66c42c 100644
--- a/HotWaterManager.ino
+++ b/HotWaterManager.ino
@@ -342,8 +342,8 @@ void setup() {
 
 #ifndef USEDEFAULT
     eeprom_read_block((void*)&rom, (void*)0, sizeof(rom));  // These are the configuration settings.
-#endif
     brightness(rom.brightness);
+#endif
 
     // Prime the "history" of the temperature. Make sure we start with a downward trend
     delay(1500);
@@ -684,9 +684,6 @@ void processmodes() {
 
     // Update the temperature trend arrow
     lcd.setCursor(13,0);
-#ifdef SIMTEMP
-    lcd.write(6);                                           // Simulate upward trend
-#else
     if(readtemp(0)-lastTemperature>=TRENDDELTA) {
         lcd.write(6);                                       // Trend is going up
         lastTemperature=readtemp(0);
@@ -695,7 +692,7 @@ void processmodes() {
         lcd.write(5);                                       // Trend is going down
         lastTemperature=readtemp(0);
     }
-#endif    
+    
     lcd.setCursor(14,0);
 
     if(hwv && hwv_timer) {                                  // If the hot water valve is selected...