cleaning up and making some changes to the DischargePropWS function, changing outputs returned.