somehow we lost the last round of edits. reinstall from memory and test
Merge branch 'tracer' of https://github.com/georgejhunt/xsce into tracer

two machines two batches of edits