PackageInfo correction & Work in progress on friends