test and fix gugs
test and fix gugs