Improved glossary and rules