corrections according to Rudolf's comments