fixed visuals and rewrote discards
edits