more control for messages
fixed strategy name
Merge branch 'master' into unstable