update comments
backport formats to 2.6