Some work on packages and ancient scrolls.
Merge pull request #11 from Xetosphere/master

Merging master with laptop branch.