fix potential error in the future
remove all instances of var
Merge branch 'master' into c
update generated_c