Updated several file to remove "egregious" errors
6 files changed