updated package and comments