General cleanup. Works from command line; house demo erases screen after redraw().