Update config with defaults and add comments
Update workspace