UBI: amend commentaries