fixed off-track backstep after a while.
The trace-scrub bug appears to be gone. Hot-swap is slow :(