Minor fixes + Ability to globalize strategies