fix duplicated pushes for computed water, fix fluid.map() missing current fluid at first call sometimes