Update tracing + comments