As for Rick and Marlo, they were fighting the last time we saw them, but after Rick was visited by his granddaughter in Future Imperfect, he reevaluated and made up with Marlo (to the chagrin of Betty, who just finished cancelling all the plans for Marlo).