Fixes several typos.
Fixes "variable name is shadowed" warnings