diff --git a/gitso/trunk/AboutWindow.py b/gitso/trunk/AboutWindow.py
index 6a16f0f..3fe99fd 100644
--- a/gitso/trunk/AboutWindow.py
+++ b/gitso/trunk/AboutWindow.py
@@ -30,8 +30,8 @@ class InfoPage(wx.Panel):
 		wx.Panel.__init__(self, parent)
 
 		infostring = "Authors:" + "\n\tAaron Gerber\n\tDerek Buranen"
-		infostring = infostring + "\n\nContributors:" + "\n\tNick Verbeck"
-		infostring = infostring + "\n\nCopyright (C) 2007 - 2008 by Aaron Gerber and Derek Buranen"
+		infostring = infostring + "\n\nContributors:" + "\n\tNick Verbeck" + "\n\tTroy Frew"
+		infostring = infostring + "\n\nCopyright (C) 2007 - 2009 by Aaron Gerber and Derek Buranen"
 		if sys.platform == "darwin":
 			infostring = infostring + "\n\n+++++++++++++++++++++++"
 			infostring = infostring + "\nChicken Of The VNC:"
@@ -47,6 +47,13 @@ class InfoPage(wx.Panel):
 	
 			infostring = infostring + "\n\nechoWare:"
 			infostring = infostring + "\n\tCopyright (C) 2004-2007 Echogent Systems, Inc"
+		elif sys.platform == "win32":
+			infostring = infostring + "\n\n+++++++++++++++++++++++"
+			infostring = infostring + "\nTightVNC && VNCviewer:"
+			infostring = infostring + "\n\tCopyright (C) 1999 AT&T Laboratories Cambridge."
+
+			infostring = infostring + "\n\nVNCHooks:"
+			infostring = infostring + "\n\tCopyright (C) 2000-2007 TightVNC Group"
 
 		info = wx.TextCtrl(self, -1, infostring, style=wx.TE_MULTILINE | wx.ST_NO_AUTORESIZE)
 		
diff --git a/gitso/trunk/ConnectionWindow.py b/gitso/trunk/ConnectionWindow.py
index 17cd1e1..cbd4ad8 100644
--- a/gitso/trunk/ConnectionWindow.py
+++ b/gitso/trunk/ConnectionWindow.py
@@ -249,7 +249,7 @@ class ConnectionWindow(wx.Frame):
 			self.hostField.SetValue("")
 	
 	
-	def KillPID(self, data=None):
+	def KillPID(self, showMessage=True):
 		"""
 		Kill VNC instance, called by the Stop Button or Application ends.
 		
@@ -260,10 +260,10 @@ class ConnectionWindow(wx.Frame):
 			self.thread.kill()
 			# If you don't wait 0.5+ seconds, the interface won't reload and it'll freeze.
 			# Possibly on older systems you should wait longer, it works fine on mine...
-			# With better thread management, I'm not sure that we need this. If we start getting freezes, look at this.
-			# time.sleep(1)
+			time.sleep(.5)
 		self.thread = None
-		self.setMessage("Idle.", False)
+		if showMessage :
+			self.setMessage("Idle.", False)
 		return
 	
 	
@@ -325,13 +325,12 @@ class ConnectionWindow(wx.Frame):
 		self.threadLock.release()
 
 	def createThread(self, host=""):
-		self.KillPID()
+		self.KillPID(False)
 		self.thread = GitsoThread.GitsoThread(self, self.paths)
 		self.thread.setHost(host)
 		self.thread.start()
 
 		# If you don't wait 1+ seconds, the interface won't reload and it'll freeze.
 		# Possibly on older systems you should wait longer, it works fine on mine...
-		# With better thread management, I'm not sure that we need this. If we start getting freezes, look at this.
-		# time.sleep(1)
+		time.sleep(1)
 
diff --git a/gitso/trunk/Processes.py b/gitso/trunk/Processes.py
index 8079d52..82e33dd 100644
--- a/gitso/trunk/Processes.py
+++ b/gitso/trunk/Processes.py
@@ -55,13 +55,11 @@ class Processes:
 	def giveSupport(self):
 		if sys.platform == 'darwin':
 			vncviewer = '%scotvnc.app/Contents/MacOS/cotvnc' % self.paths['resources']
-			print vncviewer
 			self.returnPID = os.spawnlp(os.P_NOWAIT, vncviewer, vncviewer, '--listen')
 		elif sys.platform.find('linux') != -1:
-			self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-bgr233', '-listen')                
+			self.returnPID = os.spawnlp(os.P_NOWAIT, 'vncviewer', 'vncviewer', '-bgr233', '-listen')
 		elif sys.platform == 'win32':
 			import subprocess
-			print self.paths['resources']
 			if self.paths['mode'] == 'dev':
 				self.returnPID = subprocess.Popen(['%svncviewer.exe' % self.paths['resources'], '-listen'])
 			else:
@@ -85,6 +83,11 @@ class Processes:
 				handle = win32api.OpenProcess(PROCESS_TERMINATE, False, self.returnPID.pid)
 				win32api.TerminateProcess(handle, -1)
 				win32api.CloseHandle(handle)
+			elif sys.platform.find('linux') != -1:
+				# New processes are created when you made connections. So if you kill self.returnPID,
+				# you're just killing the dispatch process, not the one actually doing business...
+				os.spawnlp(os.P_NOWAIT, 'killall', 'killall', 'vncviewer')
+				os.spawnlp(os.P_NOWAIT, 'killall', 'killall', 'x11vnc')
 			else:
 				os.kill(self.returnPID, signal.SIGKILL)
 			self.returnPID = 0
diff --git a/gitso/trunk/arch/linux/control b/gitso/trunk/arch/linux/control
index 6b01722..3c3e9ec 100644
--- a/gitso/trunk/arch/linux/control
+++ b/gitso/trunk/arch/linux/control
@@ -3,8 +3,8 @@ Version: 0.6
 Priority: optional
 Section: utils
 Architecture: all
-Depends: x11vnc, xvnc4viewer, python-wxtools
-Installed-Size: 108
+Depends: x11vnc, vncviewer, python-wxtools
+Installed-Size: 226132
 Maintainer: Derek Buranen <derek@buranen.info>
 Description: gitso is to support others (using wxPython and reverse vnc)
  gitso is a Python and wxWidgets frontend to x11vnc server
diff --git a/gitso/trunk/arch/win32/msvcr71_README.txt b/gitso/trunk/arch/win32/msvcr71_README.txt
new file mode 100644
index 0000000..369d83f
--- /dev/null
+++ b/gitso/trunk/arch/win32/msvcr71_README.txt
@@ -0,0 +1,18 @@
+Licensees of Python are permitted
+to redistribute mscvr71.dll, as long as they redistribute it in order
+to support pythonxy.dll. The EULA says
+
+# You also agree not to permit further distribution of the
+# Redistributables by your end users except you may permit further
+# redistribution of the Redistributables by your distributors to your
+# end-user customers if your distributors only distribute the
+# Redistributables in conjunction with, and as part of, the Licensee
+# Software, you comply with all other terms of this EULA, and your
+# distributors comply with all restrictions of this EULA that are
+# applicable to you.
+
+In this text, "you" is the licensee of VS 2003 (i.e. me, redistributing
+msvcr71.dll as part of Python 2.5), and the "Redistributable" is
+msvcr71.dll. The "Licensee Software" is "a software application product
+developed by you that adds significant and primary functionality to the
+Redistributables", i.e. python25.dll. 
diff --git a/gitso/trunk/makegitso.nsi b/gitso/trunk/makegitso.nsi
index 4f66316..5299a3d 100644
--- a/gitso/trunk/makegitso.nsi
+++ b/gitso/trunk/makegitso.nsi
@@ -31,7 +31,7 @@ InstallDirRegKey HKLM "Software\Gitso" "Install_Dir"
 
 ;--------------------------------
 ; Version Information
-  VIProductVersion "0.6.0.0"
+  VIProductVersion "0.6.0"
   VIAddVersionKey "ProductName" "Gitso"
   VIAddVersionKey "Comments" "Gitso is to support others"
   VIAddVersionKey "CompanyName" "http://code.google.com/p/gitso"
@@ -89,6 +89,7 @@ Section "Gitso"
   File ".\arch\win32\tightVNC_COPYING.txt"
   File ".\arch\win32\tightVNC_README.txt"
   File ".\arch\win32\VNCHooks_COPYING.txt"
+  File ".\arch\win32\msvcr71_README.txt"
  ;start menu items
   CreateDirectory "$SMPROGRAMS\Gitso"
   CreateShortCut "$SMPROGRAMS\Gitso\Gitso.lnk" "$INSTDIR\Gitso.exe" "" "$INSTDIR\icon.ico" 0