Updated packaging and fixed some previous errors.