Corrections for Edith. Change lemma to conjecture, along with syntax improvements and some missing definitions.
Update references and improve consistency.