merged back the rest of my changes to the thesis style