Thesis-update

DONE
- finished Eva's Annotations

TODO
- everything else!