Fixed the WPFViewer thing somewhat. Something else is still missing.