diff --git a/units/AoA_units/gobmon/archer-loup.cfg b/units/AoA_units/gobmon/archer-loup.cfg
index 60c9f017e..a4dd9e025 100644
--- a/units/AoA_units/gobmon/archer-loup.cfg
+++ b/units/AoA_units/gobmon/archer-loup.cfg
@@ -6,12 +6,12 @@
     gender=male
     image="units/gobmon/archer-loup.png"
     hitpoints=49
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=9
-    experience=65
+    experience=73
     level=2
     alignment=chaotic
-    cost=26
+    cost=29
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_championLoup
@@ -22,8 +22,8 @@
         description= _"fangs"
         type=blade
         range=melee
-        damage=7
-        number=4
+        damage=6
+        number=3
         icon=attacks/fangs-animal.png
     [/attack]
     [attack]
diff --git a/units/AoA_units/gobmon/archer.cfg b/units/AoA_units/gobmon/archer.cfg
index c432808e3..e98edc83b 100644
--- a/units/AoA_units/gobmon/archer.cfg
+++ b/units/AoA_units/gobmon/archer.cfg
@@ -5,19 +5,24 @@
     race=gobmon
     gender=male
     image="units/gobmon/archer.png"
-    hitpoints=23
-    movement_type=orcishfoot
+    hitpoints=26
+    movement_type=AE_gobmon
     movement=5
     experience=50
     level=1
     alignment=chaotic
-    cost=10
+    cost=13
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=null
     {AMLA_DEFAULT}
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/archer.png" "units/gobmon/archer.png" {SOUND_LIST:GOBLIN_HIT} }
+	
+	[defense]
+        forest=40
+    [/defense]
+	
     [attack]
         name=dague
         description= _"knife"
diff --git a/units/AoA_units/gobmon/assassin.cfg b/units/AoA_units/gobmon/assassin.cfg
index 545a3c4de..187248247 100644
--- a/units/AoA_units/gobmon/assassin.cfg
+++ b/units/AoA_units/gobmon/assassin.cfg
@@ -11,13 +11,60 @@
     experience=100
     level=2
     alignment=chaotic
-    cost=22
+    cost=25
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=null
     {AMLA_DEFAULT}
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/assassin.png" "units/gobmon/assassin.png" {SOUND_LIST:GOBLIN_HIT} }
+	
+	[movement_costs]
+        deep_water={UNREACHABLE}
+        shallow_water=3
+        reef=2
+        swamp_water=3
+        flat=1
+        sand=2
+        forest=2
+        hills=1
+        mountains=2
+        village=1
+        castle=1
+        cave=1
+        frozen=1
+        unwalkable={UNREACHABLE}
+        impassable={UNREACHABLE}
+        fungus=3
+    [/movement_costs]
+
+    [defense]
+        deep_water=90
+        shallow_water=60
+        reef=60
+        swamp_water=60
+        flat=40
+        sand=60
+        forest=30
+        hills=30
+        mountains=30
+        village=30
+        castle=30
+        cave=60
+        frozen=50
+        unwalkable=90
+        impassable=90
+        fungus=50
+    [/defense]
+
+    [resistance]
+        blade=120
+        pierce=110
+        impact=110
+        cold=90
+    [/resistance]
+	
+	
     [abilities]
         {ABILITY_SKIRMISHER}
     [/abilities]
@@ -26,7 +73,7 @@
         description= _"dagger"
         type=blade
         range=melee
-        damage=9
+        damage=6
         number=2
         icon=attacks/dagger-orcish.png
         [specials]
@@ -43,6 +90,7 @@
         icon=attacks/dagger-thrown-poison-orcish.png
         [specials]
             {WEAPON_SPECIAL_POISON}
+			{AE_CHS_WEAPON_SPECIAL_AIMED}
         [/specials]
     [/attack]
     {RAPIER_SOUND}
diff --git a/units/AoA_units/gobmon/chamane.cfg b/units/AoA_units/gobmon/chamane.cfg
index 11c6c756f..2622b5afc 100644
--- a/units/AoA_units/gobmon/chamane.cfg
+++ b/units/AoA_units/gobmon/chamane.cfg
@@ -6,7 +6,7 @@
     gender=male
     image="units/gobmon/chamane.png"
     hitpoints=33
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=5
     experience=100
     level=2
@@ -43,4 +43,54 @@
     [/attack]
     {STAFF_SOUND}
     {ENTANGLE_SOUND}
+	
+	[attack]
+        name=cold wave
+        #textdomain wesnoth-Ageless_Era
+
+        description= _ "cold wave"
+        icon=attacks/iceball.png
+        type=cold
+        range=ranged
+        [specials]
+            {WEAPON_SPECIAL_MAGICAL}
+        [/specials]
+        damage=5
+        number=4
+    [/attack]
+	
+	[attack_anim]
+        [filter_attack]
+            name=cold wave
+        [/filter_attack]
+        {MISSILE_FRAME_ICE}
+
+        start_time=-300
+        [frame]
+            duration=50
+            image="units/gobmon/chamane.png"
+        [/frame]
+        [frame]
+            duration=60
+            image="units/gobmon/chamane.png"
+            sound=magicmissile.wav
+        [/frame]
+        [frame]
+            duration=70
+            image="units/gobmon/chamane.png"
+        [/frame]
+        [frame]
+            duration=80
+            image="units/gobmon/chamane.png"
+        [/frame]
+        [frame]
+            duration=90
+            image="units/gobmon/chamane.png"
+        [/frame]
+        [frame]
+            duration=100
+            image="units/gobmon/chamane.pngg"
+        [/frame]
+    [/attack_anim]
+	
 [/unit_type]
diff --git a/units/AoA_units/gobmon/champion-loup.cfg b/units/AoA_units/gobmon/champion-loup.cfg
index 64983fc62..c9740bd7b 100644
--- a/units/AoA_units/gobmon/champion-loup.cfg
+++ b/units/AoA_units/gobmon/champion-loup.cfg
@@ -6,12 +6,12 @@
     gender=male
     image="units/gobmon/champion-loup.png"
     hitpoints=61
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=10
     experience=150
     level=3
     alignment=chaotic
-    cost=45
+    cost=55
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=null
@@ -23,7 +23,7 @@
         description= _"fangs"
         type=blade
         range=melee
-        damage=9
+        damage=7
         number=4
         icon=attacks/fangs-animal.png
     [/attack]
diff --git a/units/AoA_units/gobmon/chasseur.cfg b/units/AoA_units/gobmon/chasseur.cfg
index c62003a8b..1da0108f6 100644
--- a/units/AoA_units/gobmon/chasseur.cfg
+++ b/units/AoA_units/gobmon/chasseur.cfg
@@ -6,17 +6,22 @@
     gender=male
     image="units/gobmon/chasseur.png"
     hitpoints=16
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=5
     experience=23
     level=0
     alignment=chaotic
-    cost=6
+    cost=9
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_archer
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/chasseur.png" "units/gobmon/chasseur.png" {SOUND_LIST:GOBLIN_HIT} }
+	
+	[defense]
+        forest=40
+    [/defense]
+	
     [attack]
         name=dague
         description= _"knife"
diff --git a/units/AoA_units/gobmon/chef-de-clan.cfg b/units/AoA_units/gobmon/chef-de-clan.cfg
index 296befd9f..ea89011d4 100644
--- a/units/AoA_units/gobmon/chef-de-clan.cfg
+++ b/units/AoA_units/gobmon/chef-de-clan.cfg
@@ -6,7 +6,7 @@
     gender=male
     image="units/gobmon/chef-de-clan.png"
     hitpoints=40
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=5
     experience=80
     level=2
@@ -30,4 +30,60 @@
         icon=attacks/spear-orcish.png
     [/attack]
     {SPEAR_SOUND}
+	
+	[attack]
+        name=javelin
+        description={STR_JAVELIN}
+        icon=attacks/javelin-human.png
+        type=pierce
+        range=ranged
+        damage=6
+        number=1
+    [/attack]
+	
+	[attack_anim]
+        [filter_attack]
+            name=javelin
+        [/filter_attack]
+        [missile_frame]
+            begin=-150
+            end=0
+            image="projectiles/spear-n.png"
+            image_diagonal="projectiles/spear-ne.png"
+        [/missile_frame]
+        [frame]
+            begin=-250
+            end=-150
+            image="units/gobmon/chef-de-clan.png"
+            sound={SOUND_LIST:THROW}
+        [/frame]
+        [frame]
+            begin=-150
+            end=-100
+            image="units/gobmon/chef-de-clan.png"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-100
+                end=-50
+                image="units/gobmon/chef-de-clan.png"
+                sound=spear.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-100
+                end=-50
+                image="units/gobmon/chef-de-clan.png"
+            [/frame]
+        [/else]
+        [frame]
+            begin=-50
+            end=50
+            image="units/gobmon/chef-de-clan.png"
+        [/frame]
+    [/attack_anim]
+	
 [/unit_type]
diff --git a/units/AoA_units/gobmon/fantassin.cfg b/units/AoA_units/gobmon/fantassin.cfg
index c217106f1..f47be6299 100644
--- a/units/AoA_units/gobmon/fantassin.cfg
+++ b/units/AoA_units/gobmon/fantassin.cfg
@@ -5,13 +5,13 @@
     race=gobmon
     gender=male
     image="units/gobmon/fantassin.png"
-    hitpoints=26
-    movement_type=orcishfoot
+    hitpoints=29
+    movement_type=AE_gobmon
     movement=5
     experience=50
     level=1
     alignment=chaotic
-    cost=10
+    cost=13
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=null
@@ -23,9 +23,39 @@
         description= _"axe"
         type=blade
         range=melee
-        damage=8
-        number=3
+        damage=6
+        number=4
         icon=attacks/axe-crude.png
     [/attack]
     {AXE_SOUND}
+	
+	[attack]
+        name=Hatchet
+        description={STR_HATCHET}
+        icon=attacks/hatchet.png
+        type=blade
+        range=ranged
+        damage=4
+        number=1
+        [specials]
+        [/specials]
+    [/attack]
+	
+	[attack_anim]
+        [filter_attack]
+            name=Hatchet
+        [/filter_attack]
+        missile_start_time=-250
+        [missile_frame]
+            duration=250
+            image="projectiles/hatchet-1.png"
+            image_diagonal="projectiles/hatchet-1.png"
+            sound=hatchet.wav
+        [/missile_frame]
+        start_time=-500
+        [frame]
+            image=units/gobmon/fantassin.png
+        [/frame]
+    [/attack_anim]
+	
 [/unit_type]
diff --git a/units/AoA_units/gobmon/guerrier.cfg b/units/AoA_units/gobmon/guerrier.cfg
index cebb319da..507c219fe 100644
--- a/units/AoA_units/gobmon/guerrier.cfg
+++ b/units/AoA_units/gobmon/guerrier.cfg
@@ -6,12 +6,12 @@
     gender=male
     image="units/gobmon/guerrier.png"
     hitpoints=18
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=5
     experience=18
     level=0
     alignment=chaotic
-    cost=6
+    cost=9
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_fantassin
diff --git a/units/AoA_units/gobmon/meneur.cfg b/units/AoA_units/gobmon/meneur.cfg
index d9e14dbcd..21910b7fc 100644
--- a/units/AoA_units/gobmon/meneur.cfg
+++ b/units/AoA_units/gobmon/meneur.cfg
@@ -6,12 +6,12 @@
     gender=male
     image="units/gobmon/meneur.png"
     hitpoints=31
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=5
     experience=32
     level=1
     alignment=chaotic
-    cost=11
+    cost=12
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_chefDeClan
diff --git a/units/AoA_units/gobmon/monteur-de-loup.cfg b/units/AoA_units/gobmon/monteur-de-loup.cfg
index e81fb5e2e..c15d945d7 100644
--- a/units/AoA_units/gobmon/monteur-de-loup.cfg
+++ b/units/AoA_units/gobmon/monteur-de-loup.cfg
@@ -6,12 +6,12 @@
     gender=male
     image="units/gobmon/monteur-de-loup.png"
     hitpoints=32
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=8
-    experience=30
+    experience=34
     level=1
     alignment=chaotic
-    cost=16
+    cost=19
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_archerLoup
@@ -23,7 +23,7 @@
         type=blade
         range=melee
         damage=5
-        number=3
+        number=2
         icon=attacks/fangs-animal.png
     [/attack]
     [attack]
diff --git a/units/AoA_units/gobmon/seigneur-de-guerre.cfg b/units/AoA_units/gobmon/seigneur-de-guerre.cfg
index 0945bdbca..6c14b6f14 100644
--- a/units/AoA_units/gobmon/seigneur-de-guerre.cfg
+++ b/units/AoA_units/gobmon/seigneur-de-guerre.cfg
@@ -5,10 +5,10 @@
     race=gobmon
     gender=male
     image="units/gobmon/seigneur-de-guerre.png"
-    hitpoints=50
-    movement_type=orcishfoot
+    hitpoints=52
+    movement_type=AE_gobmon
     movement=5
-    experience=150
+    experience=126
     level=3
     alignment=chaotic
     cost=50
@@ -21,6 +21,11 @@
     [abilities]
         {ABILITY_LEADERSHIP}
     [/abilities]
+	
+	[defense]
+        flat=50
+    [/defense]
+	
     [attack]
         name=lance
         description= _"spear"
@@ -31,4 +36,60 @@
         icon=attacks/spear-orcish.png
     [/attack]
     {SPEAR_SOUND}
+	
+		[attack]
+        name=javelin
+        description={STR_JAVELIN}
+        icon=attacks/javelin-human.png
+        type=pierce
+        range=ranged
+        damage=7
+        number=2
+    [/attack]
+	
+	[attack_anim]
+        [filter_attack]
+            name=javelin
+        [/filter_attack]
+        [missile_frame]
+            begin=-150
+            end=0
+            image="projectiles/spear-n.png"
+            image_diagonal="projectiles/spear-ne.png"
+        [/missile_frame]
+        [frame]
+            begin=-250
+            end=-150
+            image="units/gobmon/seigneur-de-guerre.png"
+            sound={SOUND_LIST:THROW}
+        [/frame]
+        [frame]
+            begin=-150
+            end=-100
+            image="units/gobmon/seigneur-de-guerre.png"
+        [/frame]
+        [if]
+            hits=yes
+            [frame]
+                begin=-100
+                end=-50
+                image="units/gobmon/seigneur-de-guerre.png"
+                sound=spear.ogg
+            [/frame]
+        [/if]
+        [else]
+            hits=no
+            [frame]
+                begin=-100
+                end=-50
+                image="units/gobmon/seigneur-de-guerre.png"
+            [/frame]
+        [/else]
+        [frame]
+            begin=-50
+            end=50
+            image="units/gobmon/seigneur-de-guerre.png"
+        [/frame]
+    [/attack_anim]
+	
 [/unit_type]
diff --git a/units/AoA_units/gobmon/sournois.cfg b/units/AoA_units/gobmon/sournois.cfg
index c1e767094..88a796aec 100644
--- a/units/AoA_units/gobmon/sournois.cfg
+++ b/units/AoA_units/gobmon/sournois.cfg
@@ -6,17 +6,64 @@
     gender=male
     image="units/gobmon/sournois.png"
     hitpoints=23
-    movement_type=orcishfoot
+    movement_type=AE_gobmon
     movement=6
     experience=34
     level=1
     alignment=chaotic
-    cost=14
+    cost=19
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     advances_to=AE_AoA_gobmon_assassin
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/sournois.png" "units/gobmon/sournois.png" {SOUND_LIST:GOBLIN_HIT} }
+	
+	[movement_costs]
+        deep_water={UNREACHABLE}
+        shallow_water=3
+        reef=2
+        swamp_water=3
+        flat=1
+        sand=2
+        forest=2
+        hills=1
+        mountains=2
+        village=1
+        castle=1
+        cave=1
+        frozen=1
+        unwalkable={UNREACHABLE}
+        impassable={UNREACHABLE}
+        fungus=3
+    [/movement_costs]
+
+    [defense]
+        deep_water=90
+        shallow_water=60
+        reef=60
+        swamp_water=60
+        flat=40
+        sand=60
+        forest=30
+        hills=30
+        mountains=30
+        village=30
+        castle=30
+        cave=60
+        frozen=50
+        unwalkable=90
+        impassable=90
+        fungus=50
+    [/defense]
+
+    [resistance]
+        blade=120
+        pierce=110
+        impact=110
+        cold=90
+    [/resistance]
+	
+	
     [abilities]
         {ABILITY_SKIRMISHER}
     [/abilities]
@@ -25,7 +72,7 @@
         description= _"dagger"
         type=blade
         range=melee
-        damage=7
+        damage=6
         number=1
         icon=attacks/dagger-orcish.png
         [specials]
@@ -42,6 +89,7 @@
         icon=attacks/dagger-thrown-poison-orcish.png
         [specials]
             {WEAPON_SPECIAL_POISON}
+			{AE_CHS_WEAPON_SPECIAL_AIMED}
         [/specials]
     [/attack]
     {RAPIER_SOUND}