package adjustments
merging with Leppert's Cask changes
Cleanup after Cask merge.