diff --git a/dungeonsheets/character.py b/dungeonsheets/character.py
index 9270f969..eb9e9548 100644
--- a/dungeonsheets/character.py
+++ b/dungeonsheets/character.py
@@ -800,26 +800,27 @@ def proficiencies_by_type(self):
         prof_dict = {}
         w_pro = set(self.weapon_proficiencies)
         if weapons.MartialWeapon in w_pro:
-            prof_dict["Weapons"] = ["All weapons"]
+            prof_dict["Weapons"] = ["All Weapons"]
         elif weapons.SimpleWeapon in w_pro:
-            prof_dict["Weapons"] = ["Simple weapons"]
+            prof_dict["Weapons"] = ["Simple Weapons"]
             for w in w_pro:
                 if not(issubclass(w, weapons.SimpleWeapon)):
                     prof_dict["Weapons"] += [w.name]
         else:
             prof_dict["Weapons"] = [w.name for w in w_pro]
         if "Weapons" in prof_dict.keys():
-            prof_dict["Weapons"] = ", ".join(prof_dict["Weapons"]) + "."
+            prof_dict["Weapons"] = ", ".join(prof_dict["Weapons"])
+
         armor_types = ["all armor", "light armor", "medium armor",
                        "heavy armor"]
         prof_set = set([prof.lower().strip().strip('.')
                      for prof in self.proficiencies_text.split(',')])
-        prof_dict["Armor"] = [ar for ar in armor_types if ar in prof_set]
+        prof_dict["Armor"] = [ar.title() for ar in armor_types if ar in prof_set]
         if len(prof_dict["Armor"]) > 2 or 'all armor' in prof_set:
-            prof_dict["Armor"] = ["All armor"]
+            prof_dict["Armor"] = ["All Armor"]
         if 'shields' in prof_set:
-            prof_dict["Armor"] += ["shields"]
-        prof_dict["Armor"] = ", ".join(prof_dict["Armor"]) + "."
+            prof_dict["Armor"] += ["Shields"]
+        prof_dict["Armor"] = ", ".join(prof_dict["Armor"])
         if hasattr(self, 'chosen_tools'):
             prof_dict["Other"] = self.chosen_tools
         return prof_dict
diff --git a/dungeonsheets/forms/MSavage_template.tex b/dungeonsheets/forms/MSavage_template.tex
index f2c13949..a57c55ef 100644
--- a/dungeonsheets/forms/MSavage_template.tex
+++ b/dungeonsheets/forms/MSavage_template.tex
@@ -66,7 +66,7 @@
 \StealthSkillModifier{[[ "{:+d}".format(char.stealth.modifier) ]]}
 \SurvivalSkillModifier{[[ "{:+d}".format(char.survival.modifier) ]]}
 
-% Prociciencies
+% Proficiencies
 \StrengthProficiency{[[ "strength" in char.saving_throw_proficiencies ]]}
 \DexterityProficiency{[[ "dexterity" in char.saving_throw_proficiencies ]]}
 \ConstitutionProficiency{[[ "constitution" in char.saving_throw_proficiencies ]]}
@@ -123,9 +123,9 @@
 }
 
 \OtherProficienciesLanguages{
-\textbf{Languages:}  [[ char.languages ]] \\
+\textbf{Languages:}  [[ char.languages ]]. \\
 [%- for prof_type, values in char.proficiencies_by_type.items() %]
-\textbf{[[ prof_type ]]}: [[ values ]] \\
+\textbf{[[ prof_type ]]}: [[ values ]]. \\
 [%- endfor -%]
 }
 
@@ -202,4 +202,4 @@
 \renderspellsheet
 [% endif %]
 
-\end{document}
\ No newline at end of file
+\end{document}