diff --git "a/resources/espa\303\261ol/lexicon/pronouns.edn" "b/resources/espa\303\261ol/lexicon/pronouns.edn"
index 81f051c9d..1bfcc2778 100644
--- "a/resources/espa\303\261ol/lexicon/pronouns.edn"
+++ "b/resources/espa\303\261ol/lexicon/pronouns.edn"
@@ -66,6 +66,23 @@
               :pred :you}
         :reflexive? false}]
 
+ "usted" [{:case :nom
+           :agr {:number :sing
+                 :person :2nd
+                 :formal? true}
+           :sem {:ref {:human? true}
+                 :pred :you}
+           :reflexive? false}]
+
+ "ustedes" [{:case :nom
+             :agr {:number :plur
+                   :person :2nd
+                   :formal? true}            
+             :sem {:ref {:human? true}
+                   :pred :you
+                   :formal? true}
+             :reflexive? false}]
+
  "vosotros" [{:case :nom
         :agr {:number :plur
               :person :2nd}
diff --git "a/resources/espa\303\261ol/lexicon/rules.edn" "b/resources/espa\303\261ol/lexicon/rules.edn"
index dd41c713c..5d9747473 100644
--- "a/resources/espa\303\261ol/lexicon/rules.edn"
+++ "b/resources/espa\303\261ol/lexicon/rules.edn"
@@ -1,12 +1,32 @@
 [
+ {:rule :stems?
+  :if {:cat :verb
+       :stems ::unspec}
+  :then [{:stems {:boot? false
+                  :futuro? false
+                  :preterito? false}}]}
+                  
  {:rule :boot-stem?
   :if {:cat :verb
+       :stems? true
        :stems {:boot ::unspec}}
-  :then {:boot-stem? false}}
+  :then [{:stems {:boot? false}}]}
+
+ {:rule :futuro-stem?
+  :if {:cat :verb
+       :stems? true
+       :stems {:futuro ::unspec}}
+  :then [{:stems {:futuro? false}}]}
+
+ {:rule :preterito-stem?
+  :if {:cat :verb
+       :stems? true
+       :stems {:preterito ::unspec}}
+  :then [{:stems {:preterito? false}}]}
 
  {:rule :boot-stem
   :if {:cat :verb
-       :boot-stem? true}
+       :stems {:boot? true}}
   :then [{:exceptions [;; 1st, 2nd and 3rd plural:
                        {:infl :present
                         :agr {:person :1st :number :sing}
diff --git "a/resources/espa\303\261ol/lexicon/verbs.edn" "b/resources/espa\303\261ol/lexicon/verbs.edn"
index b7a70ef57..d890d4691 100644
--- "a/resources/espa\303\261ol/lexicon/verbs.edn"
+++ "b/resources/espa\303\261ol/lexicon/verbs.edn"
@@ -1,7 +1,14 @@
-{"querer" (let [stems {:boot      "quier"
+{
+ "hablar" [{:sem {:pred :speak
+                   :subj {:human true}}}
+           {:sem {:pred :talk
+                  :subj {:human true}}}]
+
+ "querer" (let [stems {:boot      "quier"
                        :preterito "quis"
                        :futuro    "querr"}]
             [{:stems stems
               :sem {:pred :want}}
              {:stems stems
-              :sem {:pred :love}}])}
+              :sem {:pred :love}}])
+ }
diff --git "a/resources/espa\303\261ol/morphology/verbs.edn" "b/resources/espa\303\261ol/morphology/verbs.edn"
index 9726046f7..d445e6e6f 100644
--- "a/resources/espa\303\261ol/morphology/verbs.edn"
+++ "b/resources/espa\303\261ol/morphology/verbs.edn"
@@ -2,28 +2,82 @@
 
  ;; <present-tense rules>
 
- {:g [#"^(.*)er$"  "$1o"] 
-  :p [#"^(.*)o$"   "$1er"] 
+ {:g [#"^(.+)er$"  "$1o"] 
+  :p [#"^(.+)o$"   "$1er"] 
   :u {:cat :verb
       :infl :present
       :agr {:number :sing
             :person :1st}}}
 
- {:g [#"^(.*)er$"  "$1emos"] 
-  :p [#"^(.*)emos$"   "$1er"] 
+ {:g [#"^(.+)ar$"  "$1o"] 
+  :p [#"^(.+)o$"   "$1ar"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :sing
+            :person :1st}}}
+
+ {:g [#"^(.+)er$"  "$1es"] 
+  :p [#"^(.+)es$"  "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :sing
+            :person :2nd
+            :formal? false}}}
+
+ {:g [#"^(.+)er$"  "$1e"] 
+  :p [#"^(.+)e$"   "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :sing
+            :formal? true}}}
+
+ {:g [#"^(.+)ar$"  "$1a"] 
+  :p [#"^(.+)a$"   "$1ar"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :sing
+            :formal? true}}}
+
+ {:g [#"^(.+)er$"   "$1emos"] 
+  :p [#"^(.+)emos$" "$1er"] 
   :u {:cat :verb
       :infl :present
       :agr {:number :plur
             :person :1st}}}
 
+ {:g [#"^(.+)er$"   "$1éis"] 
+  :p [#"^(.+)éis$"  "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :plur
+            :person :2nd
+            :formal? false}}}
 
+ {:g [#"^(.+)ar$"   "$1áis"] 
+  :p [#"^(.+)áis$"  "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :plur
+            :person :2nd
+            :formal? false}}}
+ 
+ {:g [#"^(.+)er$"   "$1en"] 
+  :p [#"^(.+)en$"   "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :plur
+            :person :2nd
+            :formal? true}}}
+ 
+ {:g [#"^(.+)er$"  "$1en"] 
+  :p [#"^(.+)en$"  "$1er"] 
+  :u {:cat :verb
+      :infl :present
+      :agr {:number :plur
+            :person :3rd
+            :formal? false}}}
  ;; </present-tense rules>
 
  ;; .. other tenses..
-
- 
- {:g [#"^(.*)$"   "$1"] 
-  :p [#"^(.*)$"   "$1"] 
-  :u {:cat :verb}}
 ]