-correct some bugs