cleanups and two working views