packages rename
fix bugs
two bugs resolved