Fix some of the -Wshadows
Fix typos