Added initialization to trace source
Tinkered some more with the tracing