- Termination behavior corrected
- Timeouts systematized and increased: simulation sped up somewhat
- Some code cleanup