final last minute changes

More comments, etc.