Fix score count and deck generation