some updates
merged