Modified list of packages and enhanced prepare script