Water Quality and System Improvements