Product returns + misc enhancements and fixes.