More tracing
Merge branch 'master' of github.com:hbatmit/ns2.35