2 bugfixes and support for scaleX, scaleY