version stepped, gofmt, small cleanups