Combined settings and defaults to reduce unneeded complexity.
Cosmetic changes (mostly related to naming.)
Some bady-needed comments and more cosmetic changes.