some bug fixed and update