I didn't like the way they handled the cop, and that got me to thinking about a few other things that they might have done better.
Matt: He goes to a lot of trouble to make his wife happy, but doesn't even bother to shave? (But then, I can't stand the scruffy look anyway.) And I was going to complain about everyone in the store continuing to react badly to his having the gun after he IDed himself as a cop. Several times. Then I remembered all those episodes of Dragnet that point out that a cop is never really off duty. At least in LA, he shouldn't have left his house without his gun and badge. He didn't have his gun and made no effort to produce his badge to calm everyone down, so he probably didn't have that either. He'll be lucky if he doesn't get suspended for such foolishness. (But at least he won't get fired for calling in sick when he wasn't.

)
Nikki: I'm really tired of her complaining about how dangerous her (ex?) husband is. She didn't know he was a gang member/leader when she married him? Or during the 10-12 years that they were married? (Yeah, I know there are people like that, but I wish someone would say: "Hey! You knew what he was like when you married him! Now shut up about it!")
Hiro: As much as I love him, just once I'd like to see him introduce himself correctly. ("I'm Nakamura Hiro.") Oh, as for others who have complained that his English has improved dramatically this episode, bear in mind that
he's the one who said that his English isn't very good. And he's a geek. I suspect that it's a matter of perception. Just because he doesn't think he speaks the language very well doesn't make it so. (In my, admittedly limited, dealingings with 'furriners' I've found that the words "My English isn't very good." is usually a good indication that I won't have a lot of trouble at least getting the gist of what they mean.)
One other thing. I caught the tail end of the repeat before Dr. Who and looked specifically for Nikki's tatoo when she was laying in bed with Nathan. I couldn't really tell whether it was not there or hidden by the shadow on her back...