             //char inbound = toupper(_serial->read());
             char inbound = C64Serial.read();
 
-            if (Modem_Echo)
+            if (Modem_EchoOn)
             {
                 if (!Modem_flowControl) 
                     delay(100/(BAUD_RATE/2400));         // Slow down command mode to prevent garbage if flow control 

  {
      setBaud(2400,true);
  }
}


void setBaud(int newBaudRate, boolean pause) {
  char temp[20];

    {
        if (strstr(Modem_CommandBuffer, ("E0")) != NULL)
        {
            Modem_EchoOn = false;
        }

        if (strstr(Modem_CommandBuffer, ("E1")) != NULL)
        {
            Modem_EchoOn = true;
        }

        if (strstr(Modem_CommandBuffer, ("Q0")) != NULL)
