Fixing products and some of the cleanup items