Fixes

Fixed recursive evaluation and discrete event execution.