Tonight, the Nathan Fillion vehicle Castle welcomed guest star Adam Baldwin, who also co-starred with Fillion on the quickly cancelled but still beloved Joss Whedon space western Firelfy. Back then, the two had an easy chemistry that often belied the contentious relationship between their characters. Clearly, the chemistry hasn't gone anywhere as the two spent the majority of the episode sparring. Here's the first scene from their reunion.

Tonight, more secrets about the murder of Beckett's mother start turning up as does the heat between this crime solving duo. All that unresolved sexual tension has to go somewhere. It's long overdue, but their kiss actually happened!

While examining the death of a magic shop owner, Castle and Beckett revisit their childhood as well as cliched themes à la The Prestige. However, secrets of the trade aren't the only ones being revealed during the investigation. Highlights inside.

Castle gets to live out a secret fantasy as the actress playing his hit character Nikki Heat shadows and mimics Det. Beckett. Unfortunately, it's not long until her mannerisms get just a little too creepy for Beckett to handle.

This week Castle visits a Prohibition era bar in search for a secret stash of liquor that people would literally kill for. In the process, he meets a young billionaire he'd like to punch and serenades Beckett with Billy Joel.

Castle and Beckett become true believers while investigating the murder of an astrophysicist who seems to have died in space. Unfortunately, when they start digging a little too deep, it's not only their murder victim that gets an otherworldly visit.

While investigating what seemed to be an open and shut murder case, Castle and Beckett stumbled upon a treasure map. What followed sounds like a really bad joke literally involving a priest, a thief, an angry wife and a geriatric.

Tonight, Castle and Beckett's relationship developed an intriguing twist when the daughter of a murdered psychic confronts the detective about a mystery man in her future. Bonus: We get to find out Castle's real name!

Hell hath no fury like a sexy police detective scorned! In the season premiere, Castle becomes the prime suspect for Detective Beckett's murder investigation and the target of her anger after rejecting her at the beginning of summer.

Here's the second part of our recap of the best live interviews from the live coverage from San Diego Comic-Con, featuring news on the upcoming movies Thor, Sucker Punch, Resident Evil: Afterlife, and more. [Part one.]

G4TV took over the E! News set on Saturday to broadcast four hours of live coverage from San Diego Comic-Con. Here are the clips related to your favorite geektastic TV shows: Community, True Blood, Castle and more!