Added ability to enter device count and voucher comment