Dial back the fun on pad() and fix a corner case.