fixed some issues with transformations