simplify some glosses; expand some abbreviations