improvements in running composite analyses
small fixes
Merge remote-tracking branch 'origin/master'