Adding Fluid class and other minor changes.