thesis: more changes