Added some more fluid calculations.