Add some repaint scheduling
Output creation cleanups