Lot of new decks

* and some minor fixes