More events for the Wizard + bug fixes.