corrected a lot of variables that were shadowing builtins