some cleanup, and added Watts

a self-computed Watts screen in the display.  Also fixes some minor
bugs in a few screens, and an OBO error in StaticQueue