Auto-organise button now has an alert icon next to it which shows a warning message - "WARNING: Files can be moved when added to the library and when editing tags." The problem is it doesn't sound like a warning but rather a description of a feature. I'd suggest the following wording: "WARNING: When enabled, files will be moved and renamed based on tags and you cannot undo the change."
Also, please add another alert icon and and warning message to the grouping setting as it seems many people can't figure it out after they adjust the setting without knowing its potential consequences.
"WARNING: If you change this setting, some of your current albums could split or merge"
This would help people return to the setting when they notice some anomalies with album grouping.