This is exactly what I was talking about. Layering in more conflict while advancing the plot makes the show so much better. The humor hit an even higher level in this episode, too. To top it off, that twist at the very end made the whole thing surprisingly wholesome!