More tweaks based on practicing talk.