improved product and projection layouts
surround calculations with try to eliminate "-" edge case