tweaks and bugfixes using feedback from BaconTracer