Tweaks to improve output