some corrections, introducing naming glossary