diff --git a/Makefile b/Makefile
index ef4d56d..c462acc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-all: mrvaserver
+.PHONY: all clean msla
+
+all: msla
 
 msla:
 	GOOS=linux GOARCH=arm64 go build
 
 mrvaserver: 
-	# GOOS=linux GOARCH=arm64 go build
 	go build
 
 clean:
diff --git a/Makefile.dot b/Makefile.dot
index b5e2006..ff0db8b 100644
--- a/Makefile.dot
+++ b/Makefile.dot
@@ -2,10 +2,21 @@
 digraph {
     node [colorscheme=set14]
     
+    // Regular targets
     "all" [shape=parallelogram style=solid color=1 penwidth=2]
     "msla" [shape=parallelogram style=solid color=2 penwidth=2]
     "mrvaserver" [shape=rectangle style=solid color=3 penwidth=2]
     "clean" [shape=parallelogram style=solid color=4 penwidth=2]
 
+    // Phony nodes
+    "all_phony" [shape=ellipse style=solid color=black]
+    "msla_phony" [shape=ellipse style=solid color=black]
+    "clean_phony" [shape=ellipse style=solid color=black]
+
+    // Dependencies
     "all" -> "msla"
+    "all" -> "all_phony"
+    "msla" -> "msla_phony"
+    "clean" -> "clean_phony"
 }
+
diff --git a/Makefile.pdf b/Makefile.pdf
new file mode 100644
index 0000000..4b37b81
Binary files /dev/null and b/Makefile.pdf differ
diff --git a/go.mod b/go.mod
index bb2d836..fc0e553 100644
--- a/go.mod
+++ b/go.mod
@@ -2,18 +2,16 @@ module mrvaserver
 
 go 1.22.0
 
-require (
-	github.com/elastic/go-sysinfo v1.14.0
-	github.com/google/uuid v1.6.0
-	github.com/gorilla/mux v1.8.1
-	github.com/hohn/mrvacommander v0.2.1
-)
+require github.com/hohn/mrvacommander v0.2.1
 
 require (
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/elastic/go-sysinfo v1.14.0 // indirect
 	github.com/elastic/go-windows v1.0.1 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -31,3 +29,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.1 // indirect
 )
+
+replace github.com/hohn/mrvacommander => /Users/hohn/work-gh/mrva/mrvacommander
diff --git a/go.sum b/go.sum
index 6f33a3b..787d9a4 100644
--- a/go.sum
+++ b/go.sum
@@ -17,8 +17,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
-github.com/hohn/mrvacommander v0.2.1 h1:HsP2Cq+pJ2e2FFagbfP9z60gvGwd1aG1srPMQ41A/Z4=
-github.com/hohn/mrvacommander v0.2.1/go.mod h1:q3rqsmLGhtjrTinUEXS1z2mwMPaTH99WeTQ45zyhdBQ=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
 github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
diff --git a/mrvaserver.code-workspace b/mrvaserver.code-workspace
index d89cad9..664423f 100644
--- a/mrvaserver.code-workspace
+++ b/mrvaserver.code-workspace
@@ -1,8 +1,14 @@
 {
 	"folders": [
-		{
-			"path": "."
-		}
+        {
+            "path": "."
+        },
+        {
+            "path": "../mrvacommander"
+        },
+        {
+            "path": "../mrvaagent"
+        }
     ],
     "settings": {
         "makefile.configureOnOpen": false