Optimized theory for simple and molecular fluids.

Optimized theory for simple and molecular fluids.