fixed comments from CR with Alex and added a default config