Thesis-update

DONE
- minor stuff

TODO
- everything else