Incorporating Constanze's edits and cleaning up a few things.