#660: #588, first half, and miscellaneous edits from glossary work

opened by TillmannTaape