simplifying some code
coupon code bugfixes