Clean-up continued
refine workflow
Merge branch 'master' into yadda-cit-eval