Continue Shopping and other improvements.

needs to be weak reference