Did all of the minor corrections suggested by Bernhard.