Minor modifications.
Update sample config.