transformers

9f6d9633 - some more fixes, i find and replace does not always find all cases