trace improvements