Lots of great hints! One I would add is if you find the need to replace your water heater, check out the on-demand type. The initial cost may be a bit more, but the combination of convenience and lower operating costs over time made it well worth it for us.