Updates to comments and package.json