fixed some stuffs