added javier's cards and combined cards
new commit of batch_full_combine
small fixes