Further comment fixing performed.