thesis: fix all stuff