small fixes
Merge branch 'master' of https://github.com/sssf/Abacus
Merge branch 'master' of https://github.com/sssf/Abacus
clean up.
Merge branch 'master' of https://github.com/sssf/Abacus