add scaling vars
Merge branch 'generate-unary-philipp-2'