fix all bugs

fix all bugs