correct some stuffs