Yes, there were some great funny bits! I do love that line of Sam's about not being able to think because the different parts of his brain were talking too loud. :P

And yeah, it's going to be an interesting season full of small little memory-wipes if Ezekiel doesn't stay buried. Sam's going to start to know something is up with all the memory-holes that he has!