some fix minor bugs