Text and database fixes (#236)

* Text fixes

domdiv/card_db/cards_db.json

@@ -1320,7 +1320,9 @@
     ], 
     "cost": "4", 
     "types": [
-        "Action"
+        "Action", 
+        "Attack", 
+        "Looter"
     ]
 },{
     "card_tag": "Market Square", 
@@ -4364,6 +4366,7 @@
     ], 
     "cost": "3", 
     "types": [
+        "Action", 
         "Reaction"
     ]
 },{

domdiv/card_db/cz/cards_cz.json

@@ -289,7 +289,7 @@
     },
     "Swamp Hag": {
         "description": "Until your next turn, when any other player buys a card, he gains a Curse.<n>At the start of your next turn:<n>+3 Coins", 
-        "extra": "you will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
+        "extra": "You will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
         "name": "Swamp Hag", 
         "untranslated": "description, extra, name"
     },
@@ -1452,8 +1452,8 @@
         "untranslated": "description, extra, name"
     },
     "Butcher": {
-        "description": "Take two Coin tokens. You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
+        "description": "+2 Coffers (take two Coin tokens)<br>You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
-        "extra": "First take two Coin tokens. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
+        "extra": "First add two Coin tokens to your Coffers mat. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
         "name": "Butcher", 
         "untranslated": "description, extra, name"
     },
@@ -2329,7 +2329,7 @@
     },
     "Dismantle": {
         "description": "Trash a card from your hand. If it costs 1 coin or more, gain a cheaper card and a Gold.", 
-        "extra": "", 
+        "extra": "Trashing is not optional. If you trash a card costing 0 Coin, or if you have no cards left in hand to trash, nothing else happens. If you trash a card costing 1 Coin or more, you gain a cheaper card and a Gold. Both come from the Supply, and are put into your discard pile. The cheaper card goes into your discard pile first. For example, if you trash a Silver (costing 3 Coin), you could gain an Estate (costing 2 Coin). There will almost always be a cheaper card in the Supply, since Copper and Curse cost 0 Coin, but if there aren't any, you still gain a Gold. If there aren't any Gold left in the Supply, you still gain the cheaper card. Cards that cost only Potion (like Transmute from Alchemy) or only Debt (like Engineer from Empires) do not cost 1 Coin or more.", 
         "name": "Dismantle", 
         "untranslated": "description, extra, name"
     },
@@ -2652,7 +2652,7 @@
         "untranslated": "description, extra, name"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve", 
         "untranslated": "description, extra, name"

domdiv/card_db/en_us/cards_en_us.json

@@ -241,7 +241,7 @@
     },
     "Swamp Hag": {
         "description": "Until your next turn, when any other player buys a card, he gains a Curse.<n>At the start of your next turn:<n>+3 Coins", 
-        "extra": "you will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
+        "extra": "You will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
         "name": "Swamp Hag"
     },
     "Teacher": {
@@ -1210,8 +1210,8 @@
         "name": "Baker"
     },
     "Butcher": {
-        "description": "Take two Coin tokens. You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
+        "description": "+2 Coffers (take two Coin tokens)<br>You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
-        "extra": "First take two Coin tokens. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
+        "extra": "First add two Coin tokens to your Coffers mat. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
         "name": "Butcher"
     },
     "Candlestick Maker": {
@@ -1332,7 +1332,7 @@
     "Jack of all Trades": {
         "description": "Gain a Silver.<n>Look at the top card of your deck; discard it or put it back.<n>Draw until you have 5 cards in hand.<n>You may trash a card from your hand that is not a Treasure.", 
         "extra": "This card does four separate things, in the order listed; you do all of them (the last one is optional). First, gain a Silver from the Supply, putting it into your discard pile. If there are no Silvers left in the Supply, you do not gain one. Second, look at the top card of your deck, and either discard it or put it back on top. If there are no cards left in your deck, shuffle your discard pile to get a card to look at (this will shuffle in the Silver you just gained). If there are still no cards, you do not look at one. Third, draw cards until you have at least five cards in hand. If you already have five or more cards in hand, you do not draw any cards. If there are not enough cards left to draw between your deck and discard pile, just draw what you can. Fourth, you may trash a card from your hand that is not a Treasure card. Cards with two types, one of which is Treasure, are Treasures.", 
-        "name": "Jack of all Trades"
+        "name": "Jack of All Trades"
     },
     "Mandarin": {
         "description": "+3 Coins<br>Put a card from your hand on top of your deck.<line>When you gain this, put all Treasures you have in play on top of your deck in any order.", 
@@ -1941,7 +1941,7 @@
     },
     "Dismantle": {
         "description": "Trash a card from your hand. If it costs 1 coin or more, gain a cheaper card and a Gold.", 
-        "extra": "", 
+        "extra": "Trashing is not optional. If you trash a card costing 0 Coin, or if you have no cards left in hand to trash, nothing else happens. If you trash a card costing 1 Coin or more, you gain a cheaper card and a Gold. Both come from the Supply, and are put into your discard pile. The cheaper card goes into your discard pile first. For example, if you trash a Silver (costing 3 Coin), you could gain an Estate (costing 2 Coin). There will almost always be a cheaper card in the Supply, since Copper and Curse cost 0 Coin, but if there aren't any, you still gain a Gold. If there aren't any Gold left in the Supply, you still gain the cheaper card. Cards that cost only Potion (like Transmute from Alchemy) or only Debt (like Engineer from Empires) do not cost 1 Coin or more.", 
         "name": "Dismantle"
     },
     "Envoy": {
@@ -2210,7 +2210,7 @@
         "name": "Horn"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve"
     },

domdiv/card_db/fr/cards_fr.json

@@ -1361,8 +1361,8 @@
         "untranslated": "description, extra"
     },
     "Butcher": {
-        "description": "Take two Coin tokens. You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
+        "description": "+2 Coffers (take two Coin tokens)<br>You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
-        "extra": "First take two Coin tokens. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
+        "extra": "First add two Coin tokens to your Coffers mat. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
         "name": "Boucher", 
         "untranslated": "description, extra"
     },
@@ -2212,7 +2212,7 @@
     },
     "Dismantle": {
         "description": "Trash a card from your hand. If it costs 1 coin or more, gain a cheaper card and a Gold.", 
-        "extra": "", 
+        "extra": "Trashing is not optional. If you trash a card costing 0 Coin, or if you have no cards left in hand to trash, nothing else happens. If you trash a card costing 1 Coin or more, you gain a cheaper card and a Gold. Both come from the Supply, and are put into your discard pile. The cheaper card goes into your discard pile first. For example, if you trash a Silver (costing 3 Coin), you could gain an Estate (costing 2 Coin). There will almost always be a cheaper card in the Supply, since Copper and Curse cost 0 Coin, but if there aren't any, you still gain a Gold. If there aren't any Gold left in the Supply, you still gain the cheaper card. Cards that cost only Potion (like Transmute from Alchemy) or only Debt (like Engineer from Empires) do not cost 1 Coin or more.", 
         "name": "Dismantle", 
         "untranslated": "description, extra, name"
     },
@@ -2535,7 +2535,7 @@
         "untranslated": "description, extra, name"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve", 
         "untranslated": "description, extra, name"

domdiv/card_db/it/cards_it.json

@@ -289,7 +289,7 @@
     },
     "Swamp Hag": {
         "description": "Until your next turn, when any other player buys a card, he gains a Curse.<n>At the start of your next turn:<n>+3 Coins", 
-        "extra": "you will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
+        "extra": "You will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
         "name": "Swamp Hag", 
         "untranslated": "description, extra, name"
     },
@@ -1387,8 +1387,8 @@
         "untranslated": "description, extra, name"
     },
     "Butcher": {
-        "description": "Take two Coin tokens. You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
+        "description": "+2 Coffers (take two Coin tokens)<br>You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
-        "extra": "First take two Coin tokens. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
+        "extra": "First add two Coin tokens to your Coffers mat. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
         "name": "Butcher", 
         "untranslated": "description, extra, name"
     },
@@ -2213,7 +2213,7 @@
     },
     "Dismantle": {
         "description": "Trash a card from your hand. If it costs 1 coin or more, gain a cheaper card and a Gold.", 
-        "extra": "", 
+        "extra": "Trashing is not optional. If you trash a card costing 0 Coin, or if you have no cards left in hand to trash, nothing else happens. If you trash a card costing 1 Coin or more, you gain a cheaper card and a Gold. Both come from the Supply, and are put into your discard pile. The cheaper card goes into your discard pile first. For example, if you trash a Silver (costing 3 Coin), you could gain an Estate (costing 2 Coin). There will almost always be a cheaper card in the Supply, since Copper and Curse cost 0 Coin, but if there aren't any, you still gain a Gold. If there aren't any Gold left in the Supply, you still gain the cheaper card. Cards that cost only Potion (like Transmute from Alchemy) or only Debt (like Engineer from Empires) do not cost 1 Coin or more.", 
         "name": "Dismantle", 
         "untranslated": "description, extra, name"
     },
@@ -2511,7 +2511,7 @@
         "untranslated": "description, extra, name"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve", 
         "untranslated": "description, extra, name"

domdiv/card_db/nl_du/cards_nl_du.json

@@ -2367,7 +2367,7 @@
         "untranslated": "description, extra, name"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve", 
         "untranslated": "description, extra, name"

domdiv/card_db/xx/cards_xx.json

@@ -289,7 +289,7 @@
     },
     "Swamp Hag": {
         "description": "Until your next turn, when any other player buys a card, he gains a Curse.<n>At the start of your next turn:<n>+3 Coins", 
-        "extra": "you will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
+        "extra": "You will get + 3 Coins at the start of your next turn; and until then, other players will gain a Curse whenever they buy a Card. Players who buy multiple cards will gain a Curse per card bought; players who do not buy any cards will not get any Curses. This is cumulative; if you play two Swamp Hags, and the player after you plays one, then the player after that will get three Curses with any card bought. This does not affect cards gained other ways, only bought cards. Buying Events is not buying cards and so does not trigger this. If you play Swamp Hag and then take an extra turn immediately, such as with Mission or Outpost (from Seaside), you will get + 3 Coins at the start of that turn and discard Swamp Hag that turn, and other players will never be affected by it. If you want to use a Reaction card like Moat against Swamp Hag, you have to use it right when Swamp Hag is played.", 
         "name": "Swamp Hag", 
         "untranslated": "description, extra, name"
     },
@@ -1452,8 +1452,8 @@
         "untranslated": "description, extra, name"
     },
     "Butcher": {
-        "description": "Take two Coin tokens. You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
+        "description": "+2 Coffers (take two Coin tokens)<br>You may trash a card from your hand and then pay any number of Coin tokens. If you did trash a card, gain a card with a cost of up to the cost of the trashed card plus the number of Coin tokens you paid.", 
-        "extra": "First take two Coin tokens. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
+        "extra": "First add two Coin tokens to your Coffers mat. Then you may trash a card from your hand and pay any number of Coin tokens (returning them to the pile). The number of Coin tokens you pay can be zero. Butcher itself is no longer in your hand and so cannot trash itself (though it can trash another copy of Butcher). If you trashed a card, you gain a card costing up to the cost of the trashed card plus the number of Coin tokens you paid. For example, you could trash an Estate and pay six Coin tokens to gain a Province, or you could trash another Butcher and pay zero Coin tokens to gain a Duchy. You can pay the Coin tokens you just got. Paying Coin tokens for this ability does not get you coins to spend, it just changes what cards you can gain with this ability.", 
         "name": "Butcher", 
         "untranslated": "description, extra, name"
     },
@@ -1598,7 +1598,7 @@
     "Jack of all Trades": {
         "description": "Gain a Silver.<n>Look at the top card of your deck; discard it or put it back.<n>Draw until you have 5 cards in hand.<n>You may trash a card from your hand that is not a Treasure.", 
         "extra": "This card does four separate things, in the order listed; you do all of them (the last one is optional). First, gain a Silver from the Supply, putting it into your discard pile. If there are no Silvers left in the Supply, you do not gain one. Second, look at the top card of your deck, and either discard it or put it back on top. If there are no cards left in your deck, shuffle your discard pile to get a card to look at (this will shuffle in the Silver you just gained). If there are still no cards, you do not look at one. Third, draw cards until you have at least five cards in hand. If you already have five or more cards in hand, you do not draw any cards. If there are not enough cards left to draw between your deck and discard pile, just draw what you can. Fourth, you may trash a card from your hand that is not a Treasure card. Cards with two types, one of which is Treasure, are Treasures.", 
-        "name": "Jack of all Trades", 
+        "name": "Jack of All Trades", 
         "untranslated": "description, extra, name"
     },
     "Mandarin": {
@@ -2329,7 +2329,7 @@
     },
     "Dismantle": {
         "description": "Trash a card from your hand. If it costs 1 coin or more, gain a cheaper card and a Gold.", 
-        "extra": "", 
+        "extra": "Trashing is not optional. If you trash a card costing 0 Coin, or if you have no cards left in hand to trash, nothing else happens. If you trash a card costing 1 Coin or more, you gain a cheaper card and a Gold. Both come from the Supply, and are put into your discard pile. The cheaper card goes into your discard pile first. For example, if you trash a Silver (costing 3 Coin), you could gain an Estate (costing 2 Coin). There will almost always be a cheaper card in the Supply, since Copper and Curse cost 0 Coin, but if there aren't any, you still gain a Gold. If there aren't any Gold left in the Supply, you still gain the cheaper card. Cards that cost only Potion (like Transmute from Alchemy) or only Debt (like Engineer from Empires) do not cost 1 Coin or more.", 
         "name": "Dismantle", 
         "untranslated": "description, extra, name"
     },
@@ -2652,7 +2652,7 @@
         "untranslated": "description, extra, name"
     },
     "Improve": {
-        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action acrd you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
+        "description": "+2 Coin<br><br>At the start of Clean-up, you may trash an Action card you would discard from play this turn, to gain a card costing exactly 1 Coin more than it.", 
         "extra": "You can only trash an Action card that would be discarded this turn; you cannot trash a non-Action like Silver, or a Duration card that will stay out (but you can trash a Duration card that will be discarded). You can trash the Improve itself. The card you gain does not have to be an Action, it just has to cost exactly 1 Coin more than the trashed Action. Using this ability is optional, but if you trash a card then you have to gain one if you can.", 
         "name": "Improve", 
         "untranslated": "description, extra, name"