refactoring and full support for combiners. all cases. tests needed asap...