some minor changes
merged