diff --git a/magic.sty b/magic.sty
index a2f2b83b53fa15d9b120a0dcec2f216e50f4bf3a..a74418b1be0adbd1df1a9a49286181c5637702b5 100644
--- a/magic.sty
+++ b/magic.sty
@@ -95,7 +95,7 @@
   \setcounter{spellPlusThree}{\value{spellCost}}%
     \addtocounter{spellPlusThree}{3}%
   \conDmg{spellPlusTwo}%
-  \renewcommand\spellEnhancements{#2}%
+  \ifstrequal{#2}{}{\renewcommand\spellEnhancements{}}{\renewcommand\spellEnhancements{#2,\space}}%
   \renewcommand\spellAction{#3}%
   \renewcommand\spellSphere{#4}%
   % What bonus does the caster receive?  Some spells will display the caster's current Bonus, so we must calculate it.  We start by setting it sky-high, then for each element in {Earth,Fire}, et c. we check if this is lower than the current castingBonus, if (if so), lower the bonus.
@@ -122,7 +122,7 @@
   \iftoggle{talisman}{%
     \index[talismans]{\textbf{#1} (\spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Area: \arabic{spellTargets}, Resisted by: \detokenize{#5}, Bonus: \arabic{spellCost}. \spellSum|adfclosedflourishleft~p.~}%
   }{%
-    \index[spells]{\textbf{#1} (Cost: \arabic{spellCost}, \spellEnhancements\ \spellAction~\spellSphere) Range: \spellRange, Targets: \arabic{spellTargets}, Resisted by: \detokenize{#5}, \spellSum|adfclosedflourishleft~p.~}%
+    \index[spells]{\textbf{#1} {\sffamily (\spellEnhancements \spellAction~\spellSphere)} \textit{Cost: \arabic{spellCost}, Range: \spellRange, Targets: \arabic{spellTargets}, Resisted by: \detokenize{#5}.} \spellSum|adfclosedflourishleft~p.~}%
   }%
 }