Minor code cleanup
Eliminate excess error popups and fix coupon calculation issues