WIP fixing transformer bugs