Begin reworking numerics
Forgot to replace a numeric
Merge branch 'master' into c
update generated_c