reformulate q25 and 26
fix typo