Partially working again

Need to fix ‘-r’ (random card) arg
Fixes!!

display function now works in all combinations!