Minor formatting changes.
Fixed trace log code.
Trace format is still unfinished.