Bug fixing

It seem that the transformation refactor gives a lot of regressions, so I did tried to refactor. Still I jump in others problems so I will need to rethink and fix my code for now. I will continue on transform issues.