Thesis-update

DONE
- stuff

TODO
- everything else...