Add and update comments