multiple fixes. adding support for transforms.