Address major Redactor issues

And upgrade to 9.1.7