diff --git a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
index e0183e2..a28ca33 100644
--- a/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
+++ b/lib/make/𓃬𓍄𓋹𓀭/mb_flow_proj.mk
@@ -290,7 +290,7 @@ define __mb-flow-proj-module-run
 
 $(1)/@run: $(1)/@build
 $(MB_@RECIPE)$$(call mb-make-call,mb-msxpipe-run-gui,$(1),,$(2))
-$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-run,$(1)/@run,Run manually with gui.)
+$(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-doc-target-run,$(1)/@run,Run manually $(notdir $(1)) with gui$(if $(2), on $(2).,.))
 $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@run)
 
 .RECIPEPREFIX := $(MB_@RECIPEPREFIX)
@@ -307,7 +307,7 @@ define __mb-flow-proj-prepare-packages
 .RECIPEPREFIX := $(MB_@RECIPE)
 
 $(1)/@@prepare-deps:: $(1)/@msxhub/$(2)
-$(1)/@msxhub/$(2):
+$(1)/@msxhub/$(2): @@module-msxhub
 $(MB_@RECIPE)$$(if $$(wildcard $(1)$$(if $(3),/$(3))),,$$(call mb-make-call,mb-os-dir-create,$(1)$$(if $(3),/$(3))))
 $(MB_@RECIPE)$$(call mb-make-call,mb-msxhub-get-$(2),$(1)$$(if $(3),/$(3)))
 $(MB_ᕽᕽᕽ　　　)$$(call mb-make-call,mb-make-target-phony,$(1)/@msxhub/$(2))
diff --git a/lib/msxbuild.mk b/lib/msxbuild.mk
index 7ae04c9..e85d07f 100644
--- a/lib/msxbuild.mk
+++ b/lib/msxbuild.mk
@@ -85,9 +85,10 @@ endif
 MB_@INCLUDE_CHAIN :=
 
 # Glue phony targets to get internal @include tree (semi) correct (TODO: fix chain in: mb_flow_0module_setup)
-.PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree
+.PHONY: @include @@include-root @@include-libs @@include-mods @@include-parent @@include-tree @@module-msxhub
 @@include-parent:: @@include-mods
 @include:: @@include-libs @@include-root
+@@module-msxhub: @@include-libs
 
 # Document our internal variables, now we have the functions loaded
 $(MB_ᕽᕽᕽ　)$(call mb-make-call,mb-doc-variable-rock,MB_@RECIPE,Recipe prefix to set and indent flow eval rules.)
diff --git a/src/example/hello-make4msx/0module000.mk b/src/example/hello-make4msx/0module000.mk
index 84b6f36..fcb8035 100644
--- a/src/example/hello-make4msx/0module000.mk
+++ b/src/example/hello-make4msx/0module000.mk
@@ -2,18 +2,22 @@
 EXAMPLE_HELLO_MAKE4MSX_SRC   := $(call mb-make-call,mb-make-module-path-src,$(PATH_SRC))
 EXAMPLE_HELLO_MAKE4MSX_BIN   := $(call mb-make-call,mb-make-module-path-bin,$(PATH_SRC),$(PATH_BIN))
 
+$(call mb-make-call,mb-flow-proj-setup,$(EXAMPLE_HELLO_MAKE4MSX_BIN),@init,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
+$(call mb-make-call,mb-flow-proj-module-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
+$(call mb-make-call,mb-flow-proj-prepare-packages,$(EXAMPLE_HELLO_MAKE4MSX_BIN),make macro80 z80asmuk,utils)
+$(call mb-make-call,mb-flow-assert-grep-binary-test,$(EXAMPLE_HELLO_MAKE4MSX_BIN),check-bin,hello.com,MAKE)
 
-$(EXAMPLE_HELLO_MAKE4MSX_BIN): | @init
-_$(MB_ᕽᕽᕽ　　)$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)))
-_$(MB_ᕽᕽᕽ　　)$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils))
-_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-make,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
-_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-macro80,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
-_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-z80asmuk,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
+#$(EXAMPLE_HELLO_MAKE4MSX_BIN): | @init
+#_$(MB_ᕽᕽᕽ　　)$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)))
+#_$(MB_ᕽᕽᕽ　　)$(if $(wildcard $(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils),,$(call mb-make-call,mb-os-dir-create,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils))
+#_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-make,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
+#_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-macro80,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
+#_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxhub-get-z80asmuk,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/utils)
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
 
 
-$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN)
+$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac: $(EXAMPLE_HELLO_MAKE4MSX_SRC)/hello.mac | $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@prepare
 _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-conv-unix2dos,$<,$@)
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac)
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@process,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.mac)
@@ -36,17 +40,15 @@ _$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxpipe-safe-cmd,$(EXAMPLE_HELLO_MA
 $(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com)
 
 
-$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build,Compiles binary with make on msx.)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build)
+$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@@build-deps:: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com
+#$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build,Compiles binary with make on msx.)
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-proj-grow-deps-phase,@build,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build)
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build)
 
 
-$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build
-_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxpipe-run-gui,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run,Run the make build manually.)
-$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run)
-
-
-$(call mb-make-call,mb-flow-assert-grep-binary-test,$(EXAMPLE_HELLO_MAKE4MSX_BIN),check-bin,hello.com,MAKE)
+#$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/@build
+#_$(MB_ᕽᕽᕽ　　)$(call mb-make-call,mb-msxpipe-run-gui,$(EXAMPLE_HELLO_MAKE4MSX_BIN))
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-doc-target-run,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run,Run the make build manually.)
+#$(MB_ᕽᕽᕽ　　　)$(call mb-make-call,mb-make-target-phony,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/@run)