Final fixes for Thesis Final Example