Update following class, some output files, updates