fix kill some error
refact and fix #15 fix #16 fix #17 fix #18 fix #19