fix minor bugs
fix bugs