Updated comments and removed a few obsolete settings.
Merge remote-tracking branch 'origin/master'