Buy Voucher Finished

Other small bug fixes