more thesis refactoring, text updates