Added fluids.
Renamed some things.