More improvements to transform origin export

I think it should be pretty stable now.