Add GOPATH
Misc changes