fixed some patchs