diff --git a/Cargo.lock b/Cargo.lock
index 1e7b59a2..60de7f23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,15 +116,6 @@ dependencies = [
  "log",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.52"
@@ -686,13 +677,9 @@ version = "2.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
 dependencies = [
- "ansi_term",
- "atty",
  "bitflags",
- "strsim 0.8.0",
  "textwrap 0.11.0",
  "unicode-width",
- "vec_map",
 ]
 
 [[package]]
@@ -705,7 +692,7 @@ dependencies = [
  "bitflags",
  "indexmap",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
  "textwrap 0.14.2",
 ]
@@ -1127,7 +1114,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
  "syn",
 ]
 
@@ -1851,8 +1838,8 @@ dependencies = [
  "android_logger",
  "backtrace",
  "byteorder",
- "cfg-if 0.1.10",
- "clap 2.34.0",
+ "cfg-if 1.0.0",
+ "clap 3.0.7",
  "core-foundation 0.9.2",
  "core-foundation-sys 0.8.3",
  "directories",
@@ -1863,7 +1850,6 @@ dependencies = [
  "log",
  "ndk",
  "ndk-glue",
- "owning_ref",
  "rpassword",
  "secret-service",
  "security-framework",
@@ -3446,12 +3432,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -3790,12 +3770,6 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
 [[package]]
 name = "veilid-cli"
 version = "0.1.0"
diff --git a/setup_android.sh b/setup_linux.sh
similarity index 100%
rename from setup_android.sh
rename to setup_linux.sh
diff --git a/setup_ios.sh b/setup_macos.sh
similarity index 82%
rename from setup_ios.sh
rename to setup_macos.sh
index 13970e08..d714dcae 100755
--- a/setup_ios.sh
+++ b/setup_macos.sh
@@ -34,5 +34,9 @@ fi
 xcode-select --install
 
 # Ensure packages are installed
-brew install capnp
+if [ "$BREW_USER" == "" ]; then
+    BREW_USER=`ls -lad /opt/homebrew/. | cut -d\  -f4`
+    echo "Must sudo to homebrew user \"$BREW_USER\" to install capnp package:"
+fi
+sudo -H -u $BREW_USER brew install capnp
 
diff --git a/veilid-flutter/pubspec.yaml b/veilid-flutter/pubspec.yaml
index bb7b9398..872f6ebf 100644
--- a/veilid-flutter/pubspec.yaml
+++ b/veilid-flutter/pubspec.yaml
@@ -1,7 +1,8 @@
 name: veilid
 description: Veilid Network
 version: 0.0.1
-homepage:
+homepage: https://veilid.com
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 environment:
   sdk: ">=2.15.1 <3.0.0"
diff --git a/setup_flutter.bat b/veilid-flutter/setup_flutter.bat
similarity index 93%
rename from setup_flutter.bat
rename to veilid-flutter/setup_flutter.bat
index 401acdbd..e5748fa0 100644
--- a/setup_flutter.bat
+++ b/veilid-flutter/setup_flutter.bat
@@ -47,6 +47,9 @@ call dart pub global activate ffigen
 rem install flutter_rust_bridge_codegen
 cargo install flutter_rust_bridge_codegen
 
+rem install just
+cargo install just
+
 rem ensure packages are installed
 winget install -e --id LLVM.LLVM --accept-package-agreements --accept-source-agreements
 
diff --git a/setup_flutter.sh b/veilid-flutter/setup_flutter.sh
similarity index 98%
rename from setup_flutter.sh
rename to veilid-flutter/setup_flutter.sh
index 46c6ccd9..80c96b57 100755
--- a/setup_flutter.sh
+++ b/veilid-flutter/setup_flutter.sh
@@ -49,6 +49,9 @@ dart pub global activate ffigen
 # install flutter_rust_bridge_codegen
 cargo install flutter_rust_bridge_codegen
 
+# install just
+cargo install just
+
 # platform specific stuff
 if [ "$OS" == "linux" ]; then
     # ensure packages are installed