Made the event based calculator more debuggable
Fixed the scenario calculator
Merge pull request #1502 from gem/debug-event-based

Make the event based calculator more debuggable