What was the answer to the question about water? The water in my building has an odd chlorine-y smell, especially the cold water. Sometimes I buy drinking water at the supermarket and sometimes I boil tap water and let it cool, which seems to help. We get Lake Michigan water. Other residents in my building have noticed the same problem and a lot of people use bottled water.
The answer was basically, if you don't want to drink it, don't make your cats drink it. Getting a filtered pitcher is better, less expensive than bottled for the long run ...