                     if (toupper(Modem_CommandBuffer[0]) == 'A' && (Modem_CommandBuffer[1] == '/'))
                     {
                         strcpy(Modem_CommandBuffer, Modem_LastCommandBuffer);
-                        if (Modem_flowControlEnabled) 
+                        if (Modem_flowControl) 
                             digitalWriteFast(C64_CTS, HIGH);
                         Modem_ProcessCommandBuffer();
                         Modem_ResetCommandBuffer();  // To prevent A matching with A/ again

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

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

        if (strstr(Modem_CommandBuffer, ("E?")) != NULL)
        {
            C64PrintIntln(EEPROM.read(ADDR_MODEM_ECHO));
        }

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


    if (strcmp(Modem_CommandBuffer, ("ATZ")) == 0)
    {
        //Modem_LoadDefaults();
        Modem_Load_Settings(0);
        Modem_PrintOK();
    }
    else if (strcmp(Modem_CommandBuffer, ("ATI")) == 0)
