Slight changes and documentation