More automatic preprocessing, add General and Extra decks.