glossary expanded and components put under their "over-lords"