Tweaks to generate a better PDF