diff --git a/ZitiTunneler/MainWindow.xaml b/ZitiTunneler/MainWindow.xaml
index d2f1c26a..e777c23d 100644
--- a/ZitiTunneler/MainWindow.xaml
+++ b/ZitiTunneler/MainWindow.xaml
@@ -7,7 +7,7 @@
         mc:Ignorable="d"
         ShowInTaskbar="False"
         x:Name="MainUI"
-        Title="MainWindow" Height="520" 
+        Title="ZitiTunneler" Height="520" 
         Width="350" ResizeMode="NoResize" 
         ClipToBounds="False"
         Icon="Assets/Images/icon.png" AllowsTransparency="True" 
diff --git a/ZitiTunneler/MainWindow.xaml.cs b/ZitiTunneler/MainWindow.xaml.cs
index ef3a22e1..413e15bc 100644
--- a/ZitiTunneler/MainWindow.xaml.cs
+++ b/ZitiTunneler/MainWindow.xaml.cs
@@ -310,8 +310,11 @@ namespace ZitiTunneler {
 			LoadIdentities();
 		}
 		private void SetNotifyIcon(string iconPrefix) {
-			System.IO.Stream iconStream = System.Windows.Application.GetResourceStream(new Uri("pack://application:,,/Assets/Images/ziti-"+iconPrefix+".ico")).Stream;
+			var iconUri = new Uri("pack://application:,,/Assets/Images/ziti-" + iconPrefix + ".ico");
+			System.IO.Stream iconStream = System.Windows.Application.GetResourceStream(iconUri).Stream;
 			notifyIcon.Icon = new System.Drawing.Icon(iconStream);
+
+			Application.Current.MainWindow.Icon = System.Windows.Media.Imaging.BitmapFrame.Create(iconUri);
 		}
 
 		private void LoadIdentities() {
diff --git a/service/cziti/sdk.go b/service/cziti/sdk.go
index 52bfd40f..ae5f6e49 100644
--- a/service/cziti/sdk.go
+++ b/service/cziti/sdk.go
@@ -145,7 +145,6 @@ func serviceCB(nf C.ziti_context, service *C.ziti_service, status C.int, data un
 			ctx.Services.Delete(id)
 			ServiceChanges <- ServiceChange{
 				Operation: REMOVED,
-				//Servicename: name,
 				Service:   &fs,
 				NFContext: ctx,
 			}
diff --git a/service/ziti-tunnel/service/ipc.go b/service/ziti-tunnel/service/ipc.go
index 3b6aac84..100f406a 100644
--- a/service/ziti-tunnel/service/ipc.go
+++ b/service/ziti-tunnel/service/ipc.go
@@ -407,7 +407,7 @@ func serveIpc(conn net.Conn) {
 		}
 
 		//save the state
-		SaveState(&rts)
+		rts.SaveState()
 
 		_ = rw.Flush()
 	}
diff --git a/service/ziti-tunnel/service/state.go b/service/ziti-tunnel/service/state.go
index c1135726..9d919cdd 100644
--- a/service/ziti-tunnel/service/state.go
+++ b/service/ziti-tunnel/service/state.go
@@ -65,7 +65,7 @@ func (t *RuntimeState) FindByIdentity(id dto.Identity) (int, *dto.Identity) {
 	return t.Find(id.FingerPrint)
 }
 
-func SaveState(t *RuntimeState) {
+func (t *RuntimeState) SaveState() {
 	// overwrite file if it exists
 	_ = os.MkdirAll(config.Path(), 0644)
 
diff --git a/version b/version
index c5d54ec3..7c1886bb 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.0.9
+0.0.10