Thesis-update

DONE
- started work in Conception-chapter

TODO
- everything else