Working out Products and Solutions more, cleaning up some models, and more