Deck change + bugfixes