diff --git a/zlibs/helpers b/zlibs/helpers
index d94d056..9019586 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -288,6 +288,6 @@ silly() {
 		"god is porco"
 		"A million hamsters are spinning their wheels right now"
 	)
-	local rnd=$(shuf -i1-30 -n 1)
+	local rnd=$(shuf -i1-$#funneh -n 1)
 	act "${funneh[$rnd]}" ; [[ $arg1 = sleep ]] && sleep $arg2
 }
diff --git a/zlibs/sysconf b/zlibs/sysconf
index 0e242d8..f88b116 100644
--- a/zlibs/sysconf
+++ b/zlibs/sysconf
@@ -66,8 +66,8 @@ fe02::1          ip6-allrouters
 EOF
 }
 
-conf_print_networkifaces() {
-	fn conf_print_networkifaces
+conf_print_netifaces() {
+	fn conf_print_netifaces
 
 	cat <<EOF
 # interfaces(5) file used by ifup(8) and ifdown(8)
diff --git a/zlibs/vm b/zlibs/vm
index 1f6bcf9..39c00e4 100644
--- a/zlibs/vm
+++ b/zlibs/vm
@@ -112,7 +112,7 @@ vm_vbox_setup() {
 	act "creating vm"
 	VBoxManage createvm --name "$vmname" --ostype Debian_64 --register || zerr
 	act "setting up ram and group"
-	VBoxManage modifyvm "$vmname" --memory 256 --groups /personalcloud || zerr
+	VBoxManage modifyvm "$vmname" --memory 256 --groups /vmsdk || zerr
 	act "setting up storage"
 	VBoxManage storagectl "$vmname" --name "IDE Controller" --add ide || zerr
 	act "attaching storage"
@@ -172,7 +172,15 @@ vm_pack_dist() {
 	silly
 	sha256sum $R/dist/${vm_name}.box > $R/dist/${vm_name}.box.sha
 	sha256sum $R/dist/${vm_name}.${imageformat} > $R/dist/${vm_name}.${imageformat}.sha
-	# TODO: XXX: cleanup vagrant/virtualbox leftovers
+	notice "cleaning up virtualbox leftovers"
+	pushd "$workdir"
+	VBoxManage unregistervm "$vmname" --delete
+	rm -f metadata.json Vagrantfile
+	rm -rf .vagrant
+	popd
+	rm -rf "$workdir"
+	rm -rf "$HOME/VirtualBox VMs/vmsdk"
+
 	notice "done!"
 	ls -1 $R/dist
 }