Sebastian's edits (except sec 4)

I left the quiz section alone for now, since I assume you're making more
changes.