Thesis improvements