Cleaned up tracing
Adding thread info