     else if (strncmp(Modem_CommandBuffer, ("AT&KEY="), 7) == 0)
     {
         if (petscii_mode)
-            wifly.setKey(petscii::ToASCII(Modem_LastCommandBuffer + 8).c_str());
+            wifly.setKey(petscii::ToASCII(Modem_LastCommandBuffer + 7).c_str());
         else 
-            wifly.setKey(Modem_LastCommandBuffer + 8);
+            wifly.setKey(Modem_LastCommandBuffer + 7);
         
         Modem_PrintOK();
     }


        while (C64Serial.available() > 0)
        {
            wifly.write(C64Serial.read());
        }

        // Alternate check for open/closed state
        if (!wifly.isConnected())
        {
            break;
        }
    }

            Modem_PrintOK();
        else
            Modem_PrintERROR();
    }
    // AT&PB1=bbs.jammingsignal.com:23
    else if (strncmp(Modem_CommandBuffer, ("AT&PBAUTO="), 10) == 0)
    {
        char numString[2];
        numString[0] = Modem_CommandBuffer[10];
        numString[1] = '\0';
        
        int phoneBookNumber = atoi(numString);
        if (phoneBookNumber >= 0 && phoneBookNumber <= 5)
        {
            updateEEPROMByte(ADDR_HOST_AUTO, phoneBookNumber);
                        
            Modem_PrintOK();
        }
        else
            Modem_PrintERROR();
    }    else if (strncmp(Modem_CommandBuffer, ("AT&PB?"), 6) == 0)
    {
        for (int i = 0; i < 5; i++)
        {
            C64Serial.print(i+1);
            C64Print(F(":"));
            C64Println(readEEPROMPhoneBook(ADDR_HOSTS + (i * ADDR_HOST_SIZE)));
        }
        C64Println();
        C64Print(F("Autostart: "));
        C64Serial.print(EEPROM.read(ADDR_HOST_AUTO));
        C64Println();
        Modem_PrintOK();
    }
    else if (strncmp(Modem_CommandBuffer, ("AT&PBCLEAR"), 6) == 0)
    {
        for (int i = 0; i < 5; i++)
        {
            updateEEPROMPhoneBook(ADDR_HOSTS + (i * ADDR_HOST_SIZE), "\0");
        }
        updateEEPROMByte(ADDR_HOST_AUTO, 0);
        Modem_PrintOK();
    }
    else if (strncmp(Modem_CommandBuffer, ("AT&PB"), 5) == 0)
    {
        char numString[2];
        numString[0] = Modem_CommandBuffer[5];
        numString[1] = '\0';
        
        int phoneBookNumber = atoi(numString);
        if (phoneBookNumber >= 1 && phoneBookNumber <= 5)
        {
            updateEEPROMPhoneBook(ADDR_HOSTS + ((phoneBookNumber-1) * ADDR_HOST_SIZE), Modem_CommandBuffer + 7);
            Modem_PrintOK();
        }
        else
            Modem_PrintERROR();
            
        //Display(readEEPROMPhoneBook(ADDR_HOSTS + ((phoneBookNumber-1) * ADDR_HOST_SIZE)));
        //delay(2000);
    }
    else if (strncmp(Modem_CommandBuffer, ("AT"), 2) == 0)
    {
