thesis: fixed some more todos, done for now