diff --git a/ChangeLog b/ChangeLog
index 773e1222..3e4c84f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,17 +6,16 @@
   * added support for 64 samples frame size in the server (if server runs in 64 or 128 samples
     mode it is still compatible to both, 64 and 128 samples frame size clients)
 
+  * fixed server not visible if in same local network, coded by pljones (Ticket #27)
+
+  * fixed column widths are slightly too narrow for "Ping Time" and "Musicians" and typos
 
 
-TODO #12 A server in the same NAT region as the client is not visible (https://sourceforge.net/p/llcon/bugs/12/)
-
-TODO https://sourceforge.net/p/llcon/discussion/533517/thread/62bd07fbcb/?limit=25#ea21
-     1) The column widths are slightly too narrow (UK English) for "Ping Time" and "Musicians" in the "Connection Setup panel.
-     2) Spellings: It would be nice if the Location  Country field had spaces in the data e.g. UnitedKingdom > United Kingdom
-        Instrument "Acoutic Guitar" > "Acoustic Guitar", Instrument "Accordeon" > "Accordion"
 
 TODO in CreateLevelsForAllConChannels we should call CStereoSignalLevelMeter::CalcLogResult instead -> make it public and static
 
+TODO auto jitter buffer performance not good at 64 samples frame size
+
 TODO for different frame sizes (64/128) the start value of 6 for the jitter buffer might be too low
 
 TODO offer the Jamulus ASIO settingspanel in case of an ASIO ERROR to fix, e.g., incorrect sample rate (https://sourceforge.net/p/llcon/discussion/533517/thread/777663cf94/#035f)
@@ -26,7 +25,6 @@ TODO Multichannel CoreAudio Support #44 -> integrate important code lines in Mac
 TODO update text in CAboutDlg
 
 
-
 TODO client: larger sound card buffers are managed by conversion buffer, not in processintern for loop (note iSndCrdFrameSizeFactor!)
 
 TODO mixer faders linear -> log gain is better
diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
index f15673b6..cadcd160 100755
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@@ -86,8 +86,8 @@ CConnectDlg::CConnectDlg ( const bool bNewShowCompleteRegList,
     lvwServers->setColumnWidth ( 2, 100 );
 #else
     lvwServers->setColumnWidth ( 0, 180 );
-    lvwServers->setColumnWidth ( 1, 65 );
-    lvwServers->setColumnWidth ( 2, 60 );
+    lvwServers->setColumnWidth ( 1, 75 );
+    lvwServers->setColumnWidth ( 2, 70 );
     lvwServers->setColumnWidth ( 3, 220 );
 #endif
     lvwServers->clear();
diff --git a/src/util.cpp b/src/util.cpp
index 06f2fd02..b290963d 100755
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -907,12 +907,12 @@ CVector<CInstPictures::CInstPictProps>& CInstPictures::GetTable()
         vecDataBase.Add ( CInstPictProps ( "Drum Set", ":/png/instr/res/instrdrumset.png", IC_PERCUSSION_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Djembe", ":/png/instr/res/instrdjembe.png", IC_PERCUSSION_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Electric Guitar", ":/png/instr/res/instreguitar.png", IC_PLUCKING_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Acoutic Guitar", ":/png/instr/res/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Acoustic Guitar", ":/png/instr/res/instraguitar.png", IC_PLUCKING_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Bass Guitar", ":/png/instr/res/instrbassguitar.png", IC_PLUCKING_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Keyboard", ":/png/instr/res/instrkeyboard.png", IC_KEYBOARD_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Synthesizer", ":/png/instr/res/instrsynthesizer.png", IC_KEYBOARD_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Grand Piano", ":/png/instr/res/instrgrandpiano.png", IC_KEYBOARD_INSTRUMENT ) );
-        vecDataBase.Add ( CInstPictProps ( "Accordeon", ":/png/instr/res/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
+        vecDataBase.Add ( CInstPictProps ( "Accordion", ":/png/instr/res/instraccordeon.png", IC_KEYBOARD_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Vocal", ":/png/instr/res/instrvocal.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Microphone", ":/png/instr/res/instrmicrophone.png", IC_OTHER_INSTRUMENT ) );
         vecDataBase.Add ( CInstPictProps ( "Harmonica", ":/png/instr/res/instrharmonica.png", IC_WIND_INSTRUMENT ) );