Improving Predictions of Water Availability and Quality in Watersheds