I loved O'Connor in Singin' In The Rain. According to a statement released by his family, among his last words were "I'd like to thank the Academy for my lifetime achievement award that I will eventually get."
I'm in agreement on the weak Kim plot. I actually care more about the whole wedding storyline and I don't even know the characters yet. If they're just using this to get Kim away from Jack, it's pretty weak. Do we know what Nina's status is?