diff --git a/.gitattributes b/.gitattributes
index 9444c3c6f32..ecd32b25a32 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2092,7 +2092,7 @@ res/cardsfolder/familiars_ruse.txt svneol=native#text/plain
 res/cardsfolder/famine.txt -text svneol=native#text/plain
 res/cardsfolder/fanatical_devotion.txt -text svneol=native#text/plain
 res/cardsfolder/fanatical_fever.txt -text svneol=native#text/plain
-res/cardsfolder/fang_skulkin.txt svneol=native#text/plain
+res/cardsfolder/fang_skulkin.txt -text svneol=native#text/plain
 res/cardsfolder/fangren_firstborn.txt -text svneol=native#text/plain
 res/cardsfolder/fangren_hunter.txt -text svneol=native#text/plain
 res/cardsfolder/fangren_marauder.txt -text svneol=native#text/plain
@@ -5610,7 +5610,7 @@ res/cardsfolder/shatterskull_giant.txt -text svneol=native#text/plain
 res/cardsfolder/shatterstorm.txt -text svneol=native#text/plain
 res/cardsfolder/shauku_endbringer.txt -text svneol=native#text/plain
 res/cardsfolder/shaukus_minion.txt -text svneol=native#text/plain
-res/cardsfolder/shell_skulkin.txt svneol=native#text/plain
+res/cardsfolder/shell_skulkin.txt -text svneol=native#text/plain
 res/cardsfolder/sheltered_valley.txt -text svneol=native#text/plain
 res/cardsfolder/shepherd_of_rot.txt -text svneol=native#text/plain
 res/cardsfolder/shepherd_of_the_lost.txt -text svneol=native#text/plain
@@ -6957,7 +6957,7 @@ res/cardsfolder/verduran_emissary.txt -text svneol=native#text/plain
 res/cardsfolder/verduran_enchantress.txt -text svneol=native#text/plain
 res/cardsfolder/vermiculos.txt -text svneol=native#text/plain
 res/cardsfolder/vernal_equinox.txt svneol=native#text/plain
-res/cardsfolder/vertigo_spawn.txt svneol=native#text/plain
+res/cardsfolder/vertigo_spawn.txt -text svneol=native#text/plain
 res/cardsfolder/vesper_ghoul.txt -text svneol=native#text/plain
 res/cardsfolder/vesuvan_doppelganger.txt -text svneol=native#text/plain
 res/cardsfolder/veteran_armorer.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/fang_skulkin.txt b/res/cardsfolder/fang_skulkin.txt
index 61a13f36c14..ac93b3dfbfa 100644
--- a/res/cardsfolder/fang_skulkin.txt
+++ b/res/cardsfolder/fang_skulkin.txt
@@ -1,11 +1,10 @@
-Name:Fang Skulkin
-ManaCost:2
-Types:Artifact Creature Scarecrow
-Text:no text
-PT:2/1
-A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Black | TgtPrompt$ Select target black creature | KW$ Wither | SpellDescription$ Target black creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.)
-SVar:PlayMain1:TRUE
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/fang_skulkin.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/168.jpg
+Name:Fang Skulkin
+ManaCost:2
+Types:Artifact Creature Scarecrow
+Text:no text
+PT:2/1
+A:AB$ Pump | Cost$ 2 | ValidTgts$ Creature.Black | TgtPrompt$ Select target black creature | KW$ Wither | SpellDescription$ Target black creature gains wither until end of turn. (It deals damage to creatures in the form of -1/-1 counters.)
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/fang_skulkin.jpg
+SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/168.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/glitterfang.txt b/res/cardsfolder/glitterfang.txt
index 92ea1de682e..d85fa9b3886 100644
--- a/res/cardsfolder/glitterfang.txt
+++ b/res/cardsfolder/glitterfang.txt
@@ -6,7 +6,6 @@ PT:1/1
 K:Haste
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigReturn | TriggerDescription$ At the beginning of the end step, return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
-SVar:PlayMain1:TRUE
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glitterfang.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/nacrolepsy.txt b/res/cardsfolder/nacrolepsy.txt
index 340e9ef33ee..a8de84a9e42 100644
--- a/res/cardsfolder/nacrolepsy.txt
+++ b/res/cardsfolder/nacrolepsy.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment Aura
 Text:no text
 K:Enchant creature
-K:enPump:0/0
+K:enPumpCurse:0/0
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Each | IsPresent$ Creature.AttachedBy+untapped | PresentCompare$ EQ1 | IsCurse$ True | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ At the beginning of each upkeep, if enchanted creature is untapped, tap it.
 SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ Enchanted
 SVar:Rarity:Common
diff --git a/res/cardsfolder/raid_bombardment.txt b/res/cardsfolder/raid_bombardment.txt
index f0ee422a782..6521c6b8e1c 100644
--- a/res/cardsfolder/raid_bombardment.txt
+++ b/res/cardsfolder/raid_bombardment.txt
@@ -4,7 +4,6 @@ Types:Enchantment
 Text:no text
 T:Mode$ Attacks | ValidCard$ Creature.powerLE2+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with power 2 or less attacks, CARDNAME deals 1 damage to defending player.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 1
-SVar:BuffedBy:Creature.powerLE2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/raid_bombardment.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/shell_skulkin.txt b/res/cardsfolder/shell_skulkin.txt
index 90e67135930..87e08cf1035 100644
--- a/res/cardsfolder/shell_skulkin.txt
+++ b/res/cardsfolder/shell_skulkin.txt
@@ -1,11 +1,10 @@
-Name:Shell Skulkin
-ManaCost:4
-Types:Artifact Creature Scarecrow
-Text:no text
-PT:3/2
-A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature | KW$ Shroud | SpellDescription$ Target blue creature gains shroud until end of turn.
-SVar:BuffedBy:Creature.Blue
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shell_skulkin.jpg
-SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/173.jpg
+Name:Shell Skulkin
+ManaCost:4
+Types:Artifact Creature Scarecrow
+Text:no text
+PT:3/2
+A:AB$ Pump | Cost$ 3 | ValidTgts$ Creature.Blue | TgtPrompt$ Select target blue creature | KW$ Shroud | SpellDescription$ Target blue creature gains shroud until end of turn.
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shell_skulkin.jpg
+SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/173.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/vertigo_spawn.txt b/res/cardsfolder/vertigo_spawn.txt
index 92a83e86630..0e30a3eb59a 100644
--- a/res/cardsfolder/vertigo_spawn.txt
+++ b/res/cardsfolder/vertigo_spawn.txt
@@ -1,12 +1,12 @@
-Name:Vertigo Spawn
-ManaCost:1 U
-Types:Creature Illusion
-Text:no text
-PT:0/3
-K:Defender
-T:Mode$ AttackerBlocked | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
-SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ SVar=DBPump
-SVar:DBPump:DB$Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/vertigo_spawn.jpg
+Name:Vertigo Spawn
+ManaCost:1 U
+Types:Creature Illusion
+Text:no text
+PT:0/3
+K:Defender
+T:Mode$ Blocks | ValidCard$ Card.Self | ValidBlocked$ Creature | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME blocks a creature, tap that creature. That creature doesn't untap during its controller's next untap step.
+SVar:TrigTap:AB$Tap | Cost$ 0 | Defined$ TriggeredAttacker | SubAbility$ SVar=DBPump
+SVar:DBPump:DB$Pump | Defined$ TriggeredAttacker | KW$ HIDDEN This card doesn't untap during your next untap step. | Permanent$ True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/vertigo_spawn.jpg
 End
\ No newline at end of file