Final pre-presentation commit
Just pushing up some minor dabblings done with comments since last time, so I don;t have to stash and revert
(last time I did that, bad stuff happened)