fixing bugs
merged