corrected some stuffs