Improvements in state handling, work on condition events.