Tidy emails a bit
Re-work logic so that you can still switch an item for a different sub product until you've added it to your cart