minor fixes and gofmt