Minor configuration changes and comments.