fixing bugs
merge