Water situation improving in Clayton County