Fixed a couple bugs with packaging (still not quite working just right)