- some TRACEing improvements