diff --git a/README.md b/README.md
index ec37e51..9383063 100755
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 1. Installs .adrw-aliases, .adrw-functions, bash & zsh powerline themes
 
 ```Bash
-$ curl -s https://raw.githubusercontent.com/adrw/.files/master/bootstrap.sh | bash -s
+$ curl -s https://raw.githubusercontent.com/adrw/.files/master/get-bootstrap.sh | bash -s && ./bootstrap.sh
 ```
 
 2. fin.
@@ -23,13 +23,13 @@ $ curl -s https://raw.githubusercontent.com/adrw/.files/master/bootstrap.sh | ba
 1. Provision with command below in Terminal for interactive mode
 
 ```Bash
-$ curl -s https://raw.githubusercontent.com/adrw/.files/master/bootstrap.sh | bash -s
+$ curl -s https://raw.githubusercontent.com/adrw/.files/master/get-bootstrap.sh | bash -s && ./bootstrap.sh
 ```
 
 OR provision with command below including any custom arguments in Terminal
 
 ```Bash
-$ cd ${HOME}/; curl -sO https://raw.githubusercontent.com/adrw/.files/master/bootstrap.sh; chmod +x ${HOME}/bootstrap.sh; ${HOME}/bootstrap.sh; rm ${HOME}/bootstrap.sh
+$ curl -s https://raw.githubusercontent.com/adrw/.files/master/get-bootstrap.sh | bash -s && ./bootstrap.sh <opts>
 ```
 
 5. Reboot (sometimes required) and fin.
diff --git a/ansible/roles/go/defaults/main.yml b/ansible/roles/go/defaults/main.yml
index d8a1a7c..a83b2b8 100644
--- a/ansible/roles/go/defaults/main.yml
+++ b/ansible/roles/go/defaults/main.yml
@@ -1 +1,2 @@
-go__path: "export PATH=$PATH:/Users/adrw/.homebrew/opt/go/libexec/bin"
+go__path: "export GOROOT=/Users/adrw/.homebrew/opt/go/libexec
+\nexport PATH=$PATH:/Users/adrw/.homebrew/opt/go/libexec/bin"
diff --git a/get-bootstrap.sh b/get-bootstrap.sh
new file mode 100755
index 0000000..27a9f36
--- /dev/null
+++ b/get-bootstrap.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm ./bootstrap.sh
+curl -s https://raw.githubusercontent.com/adrw/.files/master/bootstrap.sh -o bootstrap.sh
+chmod +x bootstrap.sh