Tweaks and image size optimizations