glossary fixes, logical model and meta data done