Added event delay metric and tidy up for debugging.
0.1.10