Slight changes and comments