Added tracing
Added simplified console messages