Fixes for older issues

Fixes #478
Fixes #599
Added rare components to foraging
Merge pull request #946 from CharonInferar/Milestone_Fixes

Fixes for older issues