add ability to add products + minor cleanup