Code refactoring. Added local gathering multipliers  for resources. Upgrade changes.

moo