Corrections for class filters + Decks!!!

Now it is generating all decks properly!