Various edits as I prepare the standalone presentation

The :noexport: tag on the setup section is particularly important!