Roger detected, other than the water heater, problem areas. He replaced valves to code and added a valve for future ease in maintenance/repair without turning off main water supply.