Tweaks.

The last commit on this will probably be 20 minutes before I present.