modify package and some fixes.