diff --git a/cmd b/cmd
index 7cf2667..0b6d49e 100755
--- a/cmd
+++ b/cmd
@@ -6,7 +6,7 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 subcmd="$1"
 
@@ -16,6 +16,6 @@ subcmd="$1"
 
 shift
 
-echo will run  "$DIR"/framework/cmd.d/"$subcmd" "$@"
+echo will run "$DIR"/framework/cmd.d/"$subcmd" "$@"
 
 exec "$DIR"/framework/cmd.d/"$subcmd" "$@"
diff --git a/express/watch.sh b/express/watch.sh
index 1421258..1883f04 100755
--- a/express/watch.sh
+++ b/express/watch.sh
@@ -11,4 +11,4 @@ source "$check_dir"/../framework/shims/node.common
 
 # $ROOT/cmd pnpm tsc --lib ES2023  --esModuleInterop -w $check_dir/app.ts
 # $ROOT/cmd pnpm tsc -w $check_dir/app.ts
-$ROOT/cmd pnpm tsc -w --project ./tsconfig.json
+$ROOT/cmd pnpm tsc --watch --project ./tsconfig.json
diff --git a/framework/cmd.d/list b/framework/cmd.d/list
index 74c5a42..c9fc066 100755
--- a/framework/cmd.d/list
+++ b/framework/cmd.d/list
@@ -2,8 +2,8 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 cd "$DIR"
 
-ls .
\ No newline at end of file
+ls .
diff --git a/framework/cmd.d/node b/framework/cmd.d/node
index dea36cd..05f3b98 100755
--- a/framework/cmd.d/node
+++ b/framework/cmd.d/node
@@ -2,6 +2,6 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 "$DIR"/../shims/node "$@"
diff --git a/framework/cmd.d/pnpm b/framework/cmd.d/pnpm
index f31a0b7..676d8b0 100755
--- a/framework/cmd.d/pnpm
+++ b/framework/cmd.d/pnpm
@@ -2,6 +2,6 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 "$DIR"/../shims/pnpm "$@"
diff --git a/framework/cmd.d/sync b/framework/cmd.d/sync
index 6684a6a..07b25ba 100755
--- a/framework/cmd.d/sync
+++ b/framework/cmd.d/sync
@@ -2,7 +2,7 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # figure out the platform we're on
 
@@ -11,11 +11,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # download $nodejs_version
 # verify its checksum against $nodejs_checksum
 
+cd "$DIR/../node"
 
-
-
-cd $DIR/../node
-
-$DIR/pnpm install
+"$DIR"/pnpm install
 
 echo we will download other files here later
diff --git a/framework/shims/common b/framework/shims/common
index a1391b9..0da9917 100644
--- a/framework/shims/common
+++ b/framework/shims/common
@@ -1,4 +1,5 @@
-common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT="$common_DIR/../../"
-
+# Fix for https://www.shellcheck.net/wiki/SC2148
+# shellcheck shell=bash
 
+common_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export ROOT="$common_DIR/../../"
diff --git a/framework/shims/node b/framework/shims/node
index 671020a..c1dce5c 100755
--- a/framework/shims/node
+++ b/framework/shims/node
@@ -4,12 +4,13 @@
 
 set -eu
 
-export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+node_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export node_shim_DIR
 
-source "$DIR/../versions"
+source "$node_shim_DIR"/../versions
 
-node_bin="$DIR/../../$nodejs_bin_dir/node"
+source "$node_shim_DIR"/node.common
+
+node_bin="$node_shim_DIR/../../$nodejs_binary_dir/node"
 
 exec "$node_bin" "$@"
-
-
diff --git a/framework/shims/node.common b/framework/shims/node.common
index 22823c7..c3253e1 100644
--- a/framework/shims/node.common
+++ b/framework/shims/node.common
@@ -1,4 +1,7 @@
-node_common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# Fix for https://www.shellcheck.net/wiki/SC2148
+# shellcheck shell=bash
+
+node_common_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # FIXME this shouldn't be hardcoded here of course
 nodejs_binary_dir="$node_common_DIR/../binaries/node-v22.15.1-linux-x64/bin"
@@ -6,7 +9,6 @@ nodejs_binary_dir="$node_common_DIR/../binaries/node-v22.15.1-linux-x64/bin"
 # This might be too restrictive.  Or not restrictive enough.
 PATH="$nodejs_binary_dir":/bin:/usr/bin
 
-
 project_root="$node_common_DIR/../.."
 
 node_dir="$project_root/$nodejs_binary_dir"
diff --git a/framework/shims/npm b/framework/shims/npm
index d6b7e7a..ddd3748 100755
--- a/framework/shims/npm
+++ b/framework/shims/npm
@@ -2,14 +2,12 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+npm_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export npm_shim_DIR
 
-source "$DIR"/node.common
+# shellcheck source=node.common
+source "$npm_shim_DIR"/node.common
 
-cd $DIR/../.nodejs-config
-echo in dir $(pwd)
+cd "$npm_shim_DIR"/../.nodejs-config
+echo in dir "$(pwd)"
 npm "$@"
-
-
-
-
diff --git a/framework/shims/pnpm b/framework/shims/pnpm
index 33c4c8a..f6dab88 100755
--- a/framework/shims/pnpm
+++ b/framework/shims/pnpm
@@ -2,11 +2,15 @@
 
 set -eu
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+pnpm_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+export pnpm_shim_DIR
 
-source "$DIR"/node.common
-source "$DIR"/common
+# shellcheck source=./node.common
+source "$pnpm_shim_DIR"/node.common
 
-cd $ROOT/framework/node
+# shellcheck source=./common
+source "$pnpm_shim_DIR"/common
 
-exec "$DIR"/../binaries/pnpm "$@"
+# cd $ROOT/framework/node
+
+exec "$pnpm_shim_DIR"/../binaries/pnpm "$@"