re
fix some minor bugs
kk
merge