New products + various related fixes