wip transformer fixes