Thesis-update

DONE
- started with Evaluation

TODO
- everything else!