various changes to my package.