A bunch of changes while scrambling to get my talk together.
Additional pre-talk changes.