Renamed coupons to vouchers, a few more bugfixes