Improve fluidflow dynamics, and allow null state