fixes to transforms, pulling Mark's changes