removed some temporary stuff around errorFiles, general cleanup