fix comment
fix 2 minor bugs