diff --git a/model.py b/model.py
index 1860c70..12fa5bf 100644
--- a/model.py
+++ b/model.py
@@ -255,7 +255,7 @@ def model_closure(initial_set: Set[ModelValue], mfunctions: Set[ModelFunction],
                         new_elements.add(element)
 
                     # Optimization: Break out of computation
-                    # early when top or bottom element is foun
+                    # early when forbidden element is found
                     if forbidden_element is not None and element == forbidden_element:
                         forbidden_found = True
                         break
@@ -287,7 +287,7 @@ def model_closure(initial_set: Set[ModelValue], mfunctions: Set[ModelFunction],
                             new_elements.add(element)
 
                         # Optimization: Break out of computation
-                        # early when top or bottom element is foun
+                        # early when forbidden element is found
                         if forbidden_element is not None and element == forbidden_element:
                             forbidden_found = True
                             break
diff --git a/parse_magic.py b/parse_magic.py
index ca5d671..bab221a 100644
--- a/parse_magic.py
+++ b/parse_magic.py
@@ -410,7 +410,7 @@ def mvalue_from_index(i: int) -> ModelValue:
     Given an index, return the
     representation of the model value.
     """
-    return ModelValue(f"a{i}")
+    return ModelValue(f"{i}")
 
 def parse_mvalue(x: str) -> ModelValue:
     """