a lot of fixes with vouchers validation and closing