change visibilities and update comments