Add better tracing
Merge branch 'master' of github.com:beingmeta/fdjt