fix all last bug