Final update before thesis defense.