severals bug fix