added abbreviations, general organization