Changing comments and making a file more closely match master