further changes to solvation.py