Fix Bugs now Groupon is working on the generic code.