Voucher fixup

Now doesn’t overflow.

Misc edits that shouldn’t effect layout also.