Mercury Fluid added and misc cleanup