assorted formatting and typo fixes

mostly identified by `go tool vet`
damn, goimports snuck this in