Some corrections and Tweaks to output