ioscomicviewer changes & additions (as of 42083407fb)