Nacogdoches making progress on rehab, water wells