Notes and comment changes