[UCT-Harvard] Address @adam3smith's comments
[UCT-Harvard] Fix thesis
[UCT-Harvard] More tweaks