@ptrck (Spoiler alert) That gag right near the end was a real show-stealer. Most people kinda knew that there would be a Klingon appearance at some point, but the way that it was handled was perfect comedic timing.

Then in the last few seconds when Spock came back on the bridge after the offscreen diplomatic bloodwine toast and...collapsed into his seat was another subtle but funny moment. We knew he had taken down another Klingon commander with his Vulcan/human alcohol tolerance and was trying to hide it upon his return to the bridge. All this lasted a second and was completely unsaid, but an excellent touch. .