Update tracing, use strict, comments