added water supplies as buildings
added functional variable calculation
renamed update<XYZ> to display<XYZ>