Tweaks and fixes to the sample output