diff --git a/setup.sh b/setup.sh
index 5fef91b..b89d955 100755
--- a/setup.sh
+++ b/setup.sh
@@ -71,11 +71,11 @@ done
 
 # Extra packages for specific distros
 if [ "$OS" == "arch" ] || [ "$OS" == "manjaro" ]; then
-    FINAL_LIST="$FINAL_LIST eza"
+    FINAL_LIST="$FINAL_LIST eza go"
 fi
 
 if [ "$OS" == "ubuntu" ] || [ "$OS" == "debian" ]; then
-    FINAL_LIST="$FINAL_LIST ca-certificates bsdmainutils pkg-config cmake"
+    FINAL_LIST="$FINAL_LIST ca-certificates bsdmainutils pkg-config cmake golang-go sysstat"
 fi
 
 echo -e "${BLUE}    LOG:${YELLOW} Installing: ${NC}$FINAL_LIST"
@@ -132,7 +132,7 @@ if [ ! -d "$HOME/.nvm" ]; then
   curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
 fi 
 
-# GVM
+# Go and GVM
 if [ ! -d "$HOME/.gvm" ]; then
     bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
 fi
@@ -193,6 +193,6 @@ stow . --target="$HOME" --ignore="setup.sh" --ignore=".git" --ignore=".gitignore
 # Finish
 echo -e "${GREEN}    LOG: Setup Complete! Please restart your terminal to apply all changes.${NC}"
 echo -e "${GREEN}         You may need to log out and back in for Docker group changes to take effect.${NC}"
-echo -e "${GREEN}         Setup GVM by running 'go listall' and 'gvm use [version] --default'.${NC}"
+echo -e "${GREEN}         Setup GVM by running 'gvm listall' then 'gvm install [version], and 'gvm use [version] --default'.${NC}"
 echo -e "${GREEN}         Setup NVM by running 'nvm install --lts' and 'nvm use --lts'${NC}"
 echo -e "${GREEN}         Setup Rust by running 'rustup default stable'${NC}"
\ No newline at end of file