packages and other changes