Updated package and changed comments