Tracing script-wide complete, bugfixes, simplifications