protobuf version up + some minor improvements