Minor updates for EnergySavvy