diff --git a/extras/aqua.sh b/extras/aqua.sh
index c0a805bc..86f1ed6e 100755
--- a/extras/aqua.sh
+++ b/extras/aqua.sh
@@ -182,12 +182,33 @@ function check_git_installed {
 function check_curl_installed {
   command -v curl >/dev/null 2>&1 || { echoerr "curl is not installed.  Installing"; exit 1; }
 }
+
+#
+# Main
+#
+
+# Check we are on a arm 32 bit machine.
+
+# below is compatable on all linux.
+#if file -Lb /usr/bin/ld | grep -s -i armhf > /dev/null; then 
+# dpkg is good for debain distros.
+if dpkg --print-architecture | grep -s -i armhf > /dev/null; then 
+  echo "Architecture is armhf"; 
+else 
+  echo "Architecture is '`dpkg --print-architecture`'"
+  echo "This does not look like linux running on a arm 32 platform"
+  echo "Please use another install method"
+  echo "https://github.com/sfeakes/AqualinkD/wiki#Install"
+  exit
+fi
+
 # Check something was passed
 if [[ $# -eq 0 ]]; then
     print_usage
     exit
 fi
 
+
 # Pass command line
 if [ "$1" == "release" ]; then
   check_curl_installed
diff --git a/onetouch.c b/onetouch.c
index f25ff269..1b928f66 100644
--- a/onetouch.c
+++ b/onetouch.c
@@ -589,8 +589,8 @@ bool log_qeuiptment_status_VP2(struct aqualinkdata *aq_data)
     } else if (PANEL_SIZE() >= 16 ) {
       // Loop over RS 16 buttons.
       get_RS16buttoninfo_from_menu(aq_data, i);
-    }
 #endif
+    }
   }
 
   return rtn;
diff --git a/release/aqualinkd b/release/aqualinkd
index 827d7c63..2652deb0 100755
Binary files a/release/aqualinkd and b/release/aqualinkd differ
diff --git a/simulator.c b/simulator.c
index 709574e4..080e0adb 100644
--- a/simulator.c
+++ b/simulator.c
@@ -9,7 +9,7 @@
 
 #define MAX_STACK 20
 int _sim_stack_place = 0;
-unsigned char _commands[MAX_STACK];
+unsigned char _sim_commands[MAX_STACK];
 
 bool push_simulator_cmd(unsigned char cmd);
 
@@ -27,7 +27,7 @@ void simulator_send_cmd(unsigned char cmd)
 bool push_simulator_cmd(unsigned char cmd)
 {
   if (_sim_stack_place < MAX_STACK) {
-    _commands[_sim_stack_place] = cmd;
+    _sim_commands[_sim_stack_place] = cmd;
     _sim_stack_place++;
   } else {
     LOG(SIM_LOG, LOG_ERR, "Command queue overflow, too many unsent commands to RS control panel\n");
@@ -42,9 +42,9 @@ unsigned char pop_simulator_cmd(unsigned char receive_type)
   unsigned char cmd = NUL;
 
   if (_sim_stack_place > 0 && receive_type == CMD_STATUS ) {
-    cmd = _commands[0];
+    cmd = _sim_commands[0];
     _sim_stack_place--;
-    memmove(&_commands[0], &_commands[1], sizeof(unsigned char) * _sim_stack_place ) ;
+    memmove(&_sim_commands[0], &_sim_commands[1], sizeof(unsigned char) * _sim_stack_place ) ;
   }
 
   LOG(SIM_LOG,LOG_DEBUG, "Sending '0x%02hhx' to controller\n", cmd);