diff --git a/run.sh b/run.sh
index 91d377c..0f946f5 100644
--- a/run.sh
+++ b/run.sh
@@ -7,6 +7,7 @@ exec 1> >(tee -a /var/log/sandboxbuild.log) 2>&1
 PKGS="
     apt-utils
     bind9-host
+    bash-completion
     bonnie++
     build-essential
     byobu
@@ -14,12 +15,12 @@ PKGS="
     daemontools
     debmirror
     default-jre
-    docker
     fonts-indic
     fonts-ipafont-gothic
     fonts-ipafont-mincho
     fortune
     git
+    golang-go
     irssi
     jq
     ldap-auth-client
@@ -34,6 +35,7 @@ PKGS="
     man-db
     mosh
     mutt
+    netcat-openbsd
     nmap
     nodejs
     npm
@@ -69,20 +71,45 @@ apt-get update
 apt-get -y upgrade
 apt-get install -y $PKGS
 
+# install docker
+apt-get install apt-transport-https ca-certificates
+apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 \
+        --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > \
+    /etc/apt/sources.list.d/docker.list
+apt-get update
+apt-get install docker-engine
+
+# install docker machine (this is gross):
+curl -L https://github.com/docker/machine/releases/download/v0.6.0/docker-machine-`uname -s`-`uname -m` > /usr/local/bin/docker-machine && \
+    chmod +x /usr/local/bin/docker-machine
+
+# install docker compose (also gross):
+curl -L
+https://github.com/docker/compose/releases/download/1.6.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
+    chmod +x /usr/local/bin/docker-compose
+# and completion
+curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose > \
+ /etc/bash_completion.d/docker-compose
+
+# install neovim
 add-apt-repository ppa:neovim-ppa/unstable
 apt-get update
 sudo apt-get install neovim
 
-# use faster one:
+# use faster parallel bzip2:
 OLD="$(which bzip2)"
 rm $OLD
 ln $(which pbzip2) $OLD
 
+# install ruby-build for rbenv install
 git clone https://github.com/rbenv/ruby-build.git /root/.rbenv/plugins/ruby-build
 
+# install some rbenv versions
 rbenv install 2.3.0
 rbenv install jruby-9.0.5.0
 
+# install some gems
 GEMS="
     bundler
 "
@@ -91,36 +118,44 @@ for GEM in $GEMS ; do
     gem install -V $GEM
 done
 
+# install ppss, paralell processing shell script
 cd /usr/local/bin
 wget https://raw.githubusercontent.com/sneak/ppss/master/ppss
 chmod +x ./ppss
 
+# update npm
+npm update -g --loglevel info npm
+
+# install some npm packages
 NPM_PKGS="
     coffee-script
     coffeelint
 "
 
-# update npm
-npm update -g --loglevel info npm
 for PKG in $NPM_PKGS ; do
     npm install -g --loglevel info $PKG
 done
 
+
+# upgrade pip and install bare essentials
+# update other packages as possible
+pip install --upgrade pip
+pip install setuptools
+pip install pip-review
+pip-review --verbose --auto
+
+# install other python packages
 PIP_PKGS="
     virtualenv
     pylint
     awscli
 "
 
-pip install --upgrade pip
-pip install setuptools
-pip install pip-review
-pip-review --verbose --auto
 for PKG in $PIP_PKGS; do
     pip install $PKG
 done
 
-# cleanup
+# cleanup filesystem after build
 
 rm -rf \
     /root/.cache \