fixing bugs;