More alterations to the new Fluids module
Fixed dict definition errors