minor updates
merged