Scaling now works properly.
Merge.