updated
merged
fixed a bit