- bugfix + exception catching.
- more work on 'finished situations'