few updates
merged