various changes and comments