Tweaks to the padding calculations, and show errors flag