Last-minute demo changes

This branch incorporates all of the changes Ben and I made last weekend as well as some last-minute additions we made on Wednesday.