diff --git a/Data/Abbr/general.csv b/Data/Abbr/general.csv
index 2678f92b..1ee9a23b 100644
--- a/Data/Abbr/general.csv
+++ b/Data/Abbr/general.csv
@@ -3587,13 +3587,14 @@ OO,Object Oriented,Over & Out
 OOAD,Object Oriented Analysis and Design
 OOBE,Out-of-body experience
 OOCL,Orient Overseas Container Line
-OODA,Observation,Orientation,Decision,Action loop (a.k.a. Boyd's Loop)
+OODA,"Observation,Orientation,Decision,Action loop (a.k.a. Boyd's Loop)"
+OOF,Out of Facility
 OOMF,One Of My Followers
 OOO,Out Of the Office
 OOP,Object-Oriented Programming,Out Of Print
 OOS,Occupational Overuse Syndrome,OneSAF Objective System,Open Operating System,Out Of Service
 OOTW,Operations Other Than War
-OP,Observation Point/Post,Ocean Pacific (surfwear and swimwear brand),Original Poster (internet),Order Point,in inventory management; the inventory state at which more items should be ordered. Often expressed as a part of OP/OQ (when quantity OP is reached,order OQ new items),Overpowered,often used to refer to fictional characters (e.g. Superman) or game mechanics (e.g. the Black Lotus in Magic: the Gathering) that are considered disproportionately strong
+OP,"Observation Point/Post,Ocean Pacific (surfwear and swimwear brand),Original Poster (internet),Order Point,in inventory management; the inventory state at which more items should be ordered. Often expressed as a part of OP/OQ (when quantity OP is reached,order OQ new items),Overpowered,often used to refer to fictional characters (e.g. Superman) or game mechanics (e.g. the Black Lotus in Magic: the Gathering) that are considered disproportionately strong"
 OPA,Other Procurement,Army
 OPAC,Online Public Access Catalogue
 OPCON,Operational control
@@ -3606,44 +3607,44 @@ OPLAN,Operation plan (also OpPlan)
 OPORD,Operation order
 OPP,Ontario Provincial Police,Operational Planning Process,Other People's Property/Pussy/Penis (song)
 OPS,On-base plus slugging (baseball statistics),Operations
-OPSEC,Operations security,Open Platform for Security
-OPSI,Overwhelming post splenectomy infection,UK Office of Public Sector Information
+OPSEC,"Operations security,Open Platform for Security"
+OPSI,"Overwhelming post splenectomy infection,UK Office of Public Sector Information"
 OPTAR,Operational target
 OPV,Offshore Patrol Vessel
-OQ,Order Quantity,in inventory management; the quantity of new items to be ordered. Often expressed as a part of OP/OQ (when quantity OP is reached,order OQ new items)
-OR,Operating Room (surgery),Operational/Operations Research,Oregon (postal symbol),overreciprocation,when the leader of an inner circle friendship contacts a friend more than is wanted or reasonable
-ORAU, Oak Ridge Associated Universities
-ORB, Object Request Broker
+OQ,"Order Quantity,in inventory management; the quantity of new items to be ordered. Often expressed as a part of OP/OQ (when quantity OP is reached,order OQ new items)"
+OR,"Operating Room (surgery),Operational/Operations Research,Oregon (postal symbol),overreciprocation,when the leader of an inner circle friendship contacts a friend more than is wanted or reasonable"
+ORAU,Oak Ridge Associated Universities
+ORB,Object Request Broker
 ORBAT,Order of Battle
-ORD,Office of Research and Development,Operational Requirements Document
+ORD,"Office of Research and Development,Operational Requirements Document"
 ORF,Operational iness Float
 ORISE,Oak Ridge Institute for Science and Education
 ORNL,Oak Ridge National Laboratory
-ORR,Oak Ridge Reservation (U.S. DOE),Office of Rail Regulation (UK government),Office of Refugee Resettlement,(CIA) Office of Research and Reports,Operational iness Rate,Operational iness Review
-ORSA,Oxacillin-resistant Staphylococcus aureus,Operations Research Society of America
+ORR,"Oak Ridge Reservation (U.S. DOE),Office of Rail Regulation (UK government),Office of Refugee Resettlement,(CIA) Office of Research and Reports,Operational iness Rate,Operational iness Review"
+ORSA,"Oxacillin-resistant Staphylococcus aureus,Operations Research Society of America"
 OS,Operating System
 Os,Osmium
 OSA,Order of St. Augustine
 OSCE,Organisation for Security and Cooperation in Europe
-OSD,U.S. Office of the Secretary of Defense,On-screen Display
+OSD,"U.S. Office of the Secretary of Defense,On-screen Display"
 OSDL,Open Source Development Labs
 OSE,Own Separate Entrance
 OSERS,U.S. Department of Education Office of Special Education and Rehabilitative Services
 OSETI,Optical SETI also Optical SETI
 OSHA,Occupational Safety and Health Administration
-OSI,Office of Strategic Influence,Ontario Swine Improvement,Open Source Initiative,Open Systems Interconnection
+OSI,"Office of Strategic Influence,Ontario Swine Improvement,Open Source Initiative,Open Systems Interconnection"
 OSIA,(U.S.) On-Site Inspection Agency
-OSIRIS,Optical,Spectroscopic,and Infrared Remote Imaging System (astronomical system on the Rosetta spacecraft),Optical System for Imaging and low Resolution Integrated Spectroscopy (astronomical system on the land-based Gran Telescopio Canarias)
-OSL,Open Source License,Optically Stimulated Luminescence,Orbiting Solar Laboratory
+OSIRIS,"Optical,Spectroscopic,and Infrared Remote Imaging System (astronomical system on the Rosetta spacecraft),Optical System for Imaging and low Resolution Integrated Spectroscopy (astronomical system on the land-based Gran Telescopio Canarias)"
+OSL,"Open Source License, Optically Stimulated Luminescence, Orbiting Solar Laboratory"
 OSM,One Saturday Morning
-OSOTPBOIAS,One Sec,On The Phone,Be Off In A Sec
+OSOTPBOIAS,"One Sec,On The Phone,Be Off In A Sec"
 OSPA,Operations Security Professional's Association site of OSPA
 OSPA,Oregon School Psychologists Association [3]
 OSRH,Oružane Snage Republike Hrvatske (en: Armed forces of the Republic of Croatia)
 OSS,Office of Strategic Services (1942-1945,forerunner of CIA)
-OSU,Ohio State University,Oklahoma State University
-OTA,Office of Technology Assessment, Orthodontic Technicians Association
-OTAC,Orthodontic Technicians Association Conference,Orthodontic Technicians Association Council
+OSU,"Ohio State University,Oklahoma State University"
+OTA,"Office of Technology Assessment, Orthodontic Technicians Association"
+OTAC,"Orthodontic Technicians Association Conference,Orthodontic Technicians Association Council"
 OTB,Off The Ball,Offtrack Betting,OneSAF Testbed (a descendant of ModSAF)
 OTC,Over-The-Counter (drugs)
 OTD,Off the derech (referring to an Orthodox Jew who has stopped practicing the tenets of his or her faith)
@@ -3651,7 +3652,7 @@ OTEA,(U.S. Army) Operational Test Evaluation Agency
 OTI,Office of Transition Initiatives (United States Agency for International Development)
 OTO,Ordo Templi Orientis (Latin,"Order of the Temple of the East",i.e. the Order of Oriental Templars)
 OTOH,On The Other Hand
-OTS,Off the scale,sexually untouchable except for a lot of money.
+OTS,"Off the scale,sexually untouchable except for a lot of money"
 OTSBH,Over The Shoulder Boulder Holder
 OTW,On The Way
 OTYBL,Over To You Blue Leader