[m12365] ACE cleanup and other text updates