thesis: fixes