swapped order of optimizations (again)
Handling now interactive deformations correctly

and some refactors