Minor fixes to last changes

(You gotta start somewhere)
- typos in a couple of comments
- removal of some log messages
- added comment clarifying some confusing code as it was being refactored
- moved a line of code outside of an if/else in the settings processing
  for simplicity