Updates and Bug fixes to dilute solution model