Add go, minor tweaks