diff --git a/Makefile b/Makefile
index d0d61f7..2ed676e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ BUNDLEIN := .bundles/domu.bundle
 
 clean-workdir = git init -q -b $* && git diff --quiet && git diff --cached --quiet || (echo 'dirty tree; check git status' && false)
 
-create-bundle = git show-ref --verify --quiet refs/remotes/${1}/$* \
+create-bundle = git show-ref --verify --quiet refs/remotes/$(1)/$* \
 	&& git bundle create $(BUNDLEOUT) $(1)/$*..$* \
 	|| git bundle create $(BUNDLEOUT) $*
 
diff --git a/setup.sh b/setup.sh
index 1d7d69f..588bf8b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -44,11 +44,12 @@ git clone /tmp/saltstuff.bundle -b "${branch}" "\$1"
 pushd "\$1"
 
 echo "{dom0} setting up remote '${guest_name}' to push/pull changes via bundle" >&2
+echo "ehhh"
 
-mkdir .bundles
-mv /tmp/saltstuff.bundle .bundles/domu.bundle
+mkdir ./.bundles
+mv /tmp/saltstuff.bundle ./.bundles/domu.bundle
 git remote remove origin
-git remote add "${guest_name}" \${pwd}/.bundles/domu.bundle
+git remote add "${guest_name}" \$(pwd)/.bundles/domu.bundle
 
 # ensure remote refs are present in each repo
 git fetch "${guest_name}" # ensure remote refs are present in the dom0 repo