fix bugs, and change package