minor fix
parameters are not hard coded anymore, plus some refactoring
now produces output plans. needs to be tested
Merge branch 'affinity' into affinity-prod-supp