refactoring, added final trace comparison tools