Merge in dmacias72 changes.

Show ups load in watts and %.