Update Flow code from MC (with names!)

I don't see anything that can account for the lag though.
More Fluid updates from MC