some little changes
merged