v2.1.1 with gofmt fix plus misc housekeeping fixes