       
         wifly.close();
 
+        autoConnectHost = EEPROM.read(ADDR_HOST_AUTO);
 #ifndef HAYES        
         Modem_flowControl = EEPROM.read(ADDR_MODEM_FLOW);
         HandleAutoStart();
 #endif  // HAYES
     
-        C64Println();
+        //C64Println();
 #ifdef HAYES
-        C64Println(F("Commodore Wi-Fi Modem Hayes Emulation"));
+        C64Println(F("\nCommodore Wi-Fi Modem Hayes Emulation"));
         ShowPETSCIIMode();
         ShowInfo(true);
-        autoConnectHost = EEPROM.read(ADDR_HOST_AUTO);
         HayesEmulationMode();
 #else
-        C64Println(F("Commodore Wi-Fi Modem"));
+        C64Println(F("\nCommodore Wi-Fi Modem"));
         ShowInfo(true);
 
     while (1)

{
    int localport = wifly.getPort();

    C64Println();
    C64Print(F("Incoming port ("));
    C64Serial.print(localport);
    C64Print(F("): "));



    while (true)
    {
        C64Println(F("\n"
                     "Change SSID\n"
                     "\n"
                     "1. WEP\n"
                     "2. WPA / WPA2\n"
                     "3. Return to Configuration Menu\n"
                     "\n"
                     "Select: "));

/*        C64Println();
        C64Println(F("Change SSID"));
        C64Println();
        C64Println(F("1. WEP"));
        C64Println(F("2. WPA / WPA2"));
        C64Println(F("3. Return to Configuration Menu"));
        C64Println();
        C64Print(F("Select: "));*/

        int option = ReadByte(C64Serial);
        C64Serial.println((char)option);
