A few small changes, according to Pieter's edits