Bug fixes in separateAllByClass, repairs to mergeClassLogs