some trivial changes
merged again