WIP on delay bug
more WIP & better tracing
cleanup from delay bug WIP
Merge pull request #3 from clarkin/delay-bug

Delay bug