Version 1.10

- Changed waiting activities as discussed with Maria
- Fixed references
- Fixed conflicting activities