Refactored Pid resolver
added ands and ena transformation rules
update wf
fixed a lot of stuff, and create a lot of transformation