[2-4] reversed sig of diag + prod
[2-4] really cleaned product unit presentation