Drinking water quality improving, but wastewater still a concern