Updates from both. Added and removed some pet/collection addons.