Some final minor tweaks I guess I hadn't committed before the presentati...

ion