Add set-config instructions
Remove intra-line diffs