Update properties and comments