Thesis-update

DONE
- worked on Evaluation

TODO
- everything else!