Various fixes to supervision of acronyms, including new long names in dict