merged text fixes from Beate