huge refactoring & bugfixing (better decision predicates representation)