diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi
index 9a8dc71..08c0c2c 100644
--- a/Projects/SAMufasaGUI/project1.lpi
+++ b/Projects/SAMufasaGUI/project1.lpi
@@ -10,7 +10,7 @@
       <TargetFileExt Value=""/>
       <Title Value="Simba"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="6"/>
+      <ActiveEditorIndexAtStart Value="8"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -138,7 +138,7 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="TestUnit"/>
         <CursorPos X="91" Y="1135"/>
-        <TopLine Value="1427"/>
+        <TopLine Value="1135"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
@@ -1706,7 +1706,7 @@
         <UnitName Value="debugimageform"/>
         <CursorPos X="20" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="194"/>
+        <UsageCount Value="195"/>
       </Unit238>
       <Unit239>
         <Filename Value="debugimage.pas"/>
@@ -1716,7 +1716,7 @@
         <UnitName Value="debugimage"/>
         <CursorPos X="66" Y="17"/>
         <TopLine Value="1"/>
-        <UsageCount Value="193"/>
+        <UsageCount Value="194"/>
       </Unit239>
       <Unit240>
         <Filename Value="debugimage.lrs"/>
@@ -1838,7 +1838,7 @@
         <UnitName Value="framefunctionlist"/>
         <CursorPos X="117" Y="5"/>
         <TopLine Value="1"/>
-        <UsageCount Value="114"/>
+        <UsageCount Value="115"/>
       </Unit257>
       <Unit258>
         <Filename Value="../../../usr/local/share/lazarus/lcl/comctrls.pp"/>
@@ -1893,7 +1893,7 @@
         <UnitName Value="simpleanalyzer"/>
         <CursorPos X="52" Y="104"/>
         <TopLine Value="193"/>
-        <UsageCount Value="101"/>
+        <UsageCount Value="102"/>
       </Unit265>
       <Unit266>
         <Filename Value="../../Units/Misc/mPasLex.pas"/>
@@ -1966,9 +1966,11 @@
         <Filename Value="../../Units/MMLAddon/updater.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="updater"/>
-        <CursorPos X="112" Y="106"/>
-        <TopLine Value="68"/>
-        <UsageCount Value="74"/>
+        <CursorPos X="119" Y="202"/>
+        <TopLine Value="195"/>
+        <EditorIndex Value="9"/>
+        <UsageCount Value="75"/>
+        <Loaded Value="True"/>
       </Unit276>
       <Unit277>
         <Filename Value="updateform.pas"/>
@@ -1976,10 +1978,10 @@
         <ComponentName Value="SimbaUpdateForm"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="updateform"/>
-        <CursorPos X="84" Y="153"/>
-        <TopLine Value="162"/>
+        <CursorPos X="37" Y="187"/>
+        <TopLine Value="153"/>
         <EditorIndex Value="8"/>
-        <UsageCount Value="69"/>
+        <UsageCount Value="70"/>
         <Loaded Value="True"/>
       </Unit277>
       <Unit278>
@@ -2102,7 +2104,7 @@
         <CursorPos X="26" Y="9"/>
         <TopLine Value="1"/>
         <EditorIndex Value="2"/>
-        <UsageCount Value="32"/>
+        <UsageCount Value="33"/>
         <Loaded Value="True"/>
       </Unit295>
       <Unit296>
@@ -2132,123 +2134,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="testunit.pas"/>
-        <Caret Line="279" Column="21" TopLine="261"/>
+        <Caret Line="438" Column="59" TopLine="416"/>
       </Position1>
       <Position2>
         <Filename Value="testunit.pas"/>
-        <Caret Line="280" Column="21" TopLine="261"/>
+        <Caret Line="461" Column="25" TopLine="432"/>
       </Position2>
       <Position3>
         <Filename Value="testunit.pas"/>
-        <Caret Line="281" Column="21" TopLine="261"/>
+        <Caret Line="459" Column="65" TopLine="441"/>
       </Position3>
       <Position4>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="438" Column="59" TopLine="416"/>
+        <Filename Value="../../Units/MMLAddon/settings.pas"/>
+        <Caret Line="52" Column="37" TopLine="35"/>
       </Position4>
       <Position5>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="461" Column="25" TopLine="432"/>
+        <Filename Value="../../Units/MMLAddon/settings.pas"/>
+        <Caret Line="67" Column="79" TopLine="35"/>
       </Position5>
       <Position6>
         <Filename Value="testunit.pas"/>
-        <Caret Line="459" Column="65" TopLine="441"/>
+        <Caret Line="406" Column="54" TopLine="379"/>
       </Position6>
       <Position7>
-        <Filename Value="../../Units/MMLAddon/settings.pas"/>
-        <Caret Line="52" Column="37" TopLine="35"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="440" Column="31" TopLine="422"/>
       </Position7>
       <Position8>
-        <Filename Value="../../Units/MMLAddon/settings.pas"/>
-        <Caret Line="67" Column="79" TopLine="35"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="441" Column="24" TopLine="422"/>
       </Position8>
       <Position9>
         <Filename Value="testunit.pas"/>
-        <Caret Line="406" Column="54" TopLine="379"/>
+        <Caret Line="442" Column="36" TopLine="422"/>
       </Position9>
       <Position10>
         <Filename Value="testunit.pas"/>
-        <Caret Line="440" Column="31" TopLine="422"/>
+        <Caret Line="454" Column="44" TopLine="422"/>
       </Position10>
       <Position11>
         <Filename Value="testunit.pas"/>
-        <Caret Line="441" Column="24" TopLine="422"/>
+        <Caret Line="455" Column="30" TopLine="422"/>
       </Position11>
       <Position12>
         <Filename Value="testunit.pas"/>
-        <Caret Line="442" Column="36" TopLine="422"/>
+        <Caret Line="456" Column="40" TopLine="422"/>
       </Position12>
       <Position13>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="454" Column="44" TopLine="422"/>
+        <Filename Value="updateform.pas"/>
+        <Caret Line="160" Column="87" TopLine="133"/>
       </Position13>
       <Position14>
         <Filename Value="testunit.pas"/>
-        <Caret Line="455" Column="30" TopLine="422"/>
+        <Caret Line="17" Column="94" TopLine="1"/>
       </Position14>
       <Position15>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="456" Column="40" TopLine="422"/>
+        <Filename Value="../../Units/MMLAddon/settings.pas"/>
+        <Caret Line="97" Column="56" TopLine="63"/>
       </Position15>
       <Position16>
-        <Filename Value="updateform.pas"/>
-        <Caret Line="160" Column="87" TopLine="133"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="23" Column="48" TopLine="17"/>
       </Position16>
       <Position17>
         <Filename Value="testunit.pas"/>
-        <Caret Line="17" Column="94" TopLine="1"/>
+        <Caret Line="42" Column="30" TopLine="19"/>
       </Position17>
       <Position18>
-        <Filename Value="../../Units/MMLAddon/settings.pas"/>
-        <Caret Line="97" Column="56" TopLine="63"/>
+        <Filename Value="simbasettings.pas"/>
+        <Caret Line="9" Column="26" TopLine="1"/>
       </Position18>
       <Position19>
         <Filename Value="testunit.pas"/>
-        <Caret Line="23" Column="48" TopLine="17"/>
+        <Caret Line="39" Column="16" TopLine="19"/>
       </Position19>
       <Position20>
         <Filename Value="testunit.pas"/>
-        <Caret Line="42" Column="30" TopLine="19"/>
+        <Caret Line="298" Column="14" TopLine="280"/>
       </Position20>
       <Position21>
-        <Filename Value="simbasettings.pas"/>
-        <Caret Line="9" Column="26" TopLine="1"/>
+        <Filename Value="testunit.pas"/>
+        <Caret Line="557" Column="15" TopLine="531"/>
       </Position21>
       <Position22>
         <Filename Value="testunit.pas"/>
-        <Caret Line="39" Column="16" TopLine="19"/>
+        <Caret Line="298" Column="17" TopLine="280"/>
       </Position22>
       <Position23>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="298" Column="14" TopLine="280"/>
+        <Filename Value="../../Units/MMLCore/ocr.pas"/>
+        <Caret Line="40" Column="31" TopLine="19"/>
       </Position23>
       <Position24>
         <Filename Value="testunit.pas"/>
-        <Caret Line="557" Column="15" TopLine="531"/>
+        <Caret Line="544" Column="14" TopLine="528"/>
       </Position24>
       <Position25>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="298" Column="17" TopLine="280"/>
-      </Position25>
-      <Position26>
-        <Filename Value="../../Units/MMLCore/ocr.pas"/>
-        <Caret Line="40" Column="31" TopLine="19"/>
-      </Position26>
-      <Position27>
-        <Filename Value="testunit.pas"/>
-        <Caret Line="544" Column="14" TopLine="528"/>
-      </Position27>
-      <Position28>
         <Filename Value="../../Units/MMLAddon/settings.pas"/>
         <Caret Line="97" Column="56" TopLine="65"/>
-      </Position28>
-      <Position29>
+      </Position25>
+      <Position26>
         <Filename Value="../../Units/MMLAddon/settings.pas"/>
         <Caret Line="410" Column="22" TopLine="389"/>
-      </Position29>
-      <Position30>
+      </Position26>
+      <Position27>
         <Filename Value="../../Units/MMLAddon/settings.pas"/>
         <Caret Line="91" Column="37" TopLine="73"/>
+      </Position27>
+      <Position28>
+        <Filename Value="updateform.pas"/>
+        <Caret Line="102" Column="32" TopLine="87"/>
+      </Position28>
+      <Position29>
+        <Filename Value="updateform.pas"/>
+        <Caret Line="177" Column="49" TopLine="160"/>
+      </Position29>
+      <Position30>
+        <Filename Value="updateform.pas"/>
+        <Caret Line="39" Column="25" TopLine="19"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/Projects/SAMufasaGUI/updateform.pas b/Projects/SAMufasaGUI/updateform.pas
index 4e1bf5c..b0b7d43 100644
--- a/Projects/SAMufasaGUI/updateform.pas
+++ b/Projects/SAMufasaGUI/updateform.pas
@@ -89,12 +89,14 @@ begin
     FSimbaVersion := StrToIntDef(Trim(SimbaVersionThread.ResultStr), -1);//Read output
     FreeAndNil(SimbaVersionThread);//Free the thread
   end else
+  begin
     //Another thread is already running, lets wait for it! (When it's nil, it means that the result is written!)
     while SimbaVersionThread = nil do
     begin;
       Application.ProcessMessages;
       Sleep(50);
     end;
+  end;
   Exit(FSimbaVersion);
 end;
 
@@ -165,6 +167,7 @@ begin
 
   Self.UpdateLog.Lines.Add('Starting download of ' + Updater.FileURL + ' ...');
   try
+    Self.OkButton.Enabled := False; // grey out button
     Updater.DownloadAndSave;
     Self.UpdateLog.Lines.Add('Downloaded to ' + Updater.ReplacementFile + '_ ...');
     Updater.Replace;
@@ -181,6 +184,7 @@ begin
   end;
   Self.UpdateLog.Lines.Add('Done ... ');
   Self.UpdateLog.Lines.Add('Please restart all currently running Simba binaries.');
+  Self.OkButton.Enabled := True; // un-grey out button
 end;
 
 { TSimbaVersionThread }