Improvements in scaling and clipping