another bug fix and go fmt