thesis updated, all chapters