fixing bugs

fixing bugs