Some more comments and return of some config.