fix some bugs
current commit. bug fixing
current commit, bug fixing
bug fixing