Some minimal changes (almost comments).