End of proofreading. The last step now is to update the diagrams and the appendix & fix the last 3 todos that are related to this