Updated CompInfo, and small change to CompViewer