Re-worded / re-organized data config window.
Misc changes.