more handling of output classes
arrange handling of class. closes #69