cleanup
cards
fixed a bunch