update comments and so on