all fixes except products2 check