Added error handling for acronyms; reduced overzealous scope on acronyms.