fix lots of bug
commit
commit