add escaping
Update the modification of the retriever settings for the new schema
Break up long lines to avoid the mail system doing it for us, badly