Added Fluid settings and tidied up