Fixed small error in trace + fixed layout of trace table