wrapped functions with more than 1 operand in lambdas, fuck those lambdas.
Merge branch 'calc'