some bug fuxes