Work on voucher addition and some cleanup.