test
fix minor bugs