Config cleanup; added missing comments.