In the books, it's pretty clear at this point that Katniss isn't romantically interested in either Peeta *or* Gale. In fact, a lot of her internal monologue is about how she's too messed up to consider romance with anyone, that their feelings towards her just make her feel confused and frustrated, and that she never wants to get married because she's afraid of seeing her kids in the games. A lot of the romance in the movies is more contrived and pronounced than it is in the books, partially because it's hard to know what Katniss is feeling because the movies aren't directly her thoughts/POV like the books are, partially because romance and love triangles sell movies like hot cakes.
Also, I thought the wire scene worked better in the movie than it did in the books. It was kind of confusing to follow in the books, but seeing it on the screen made it click easier. At least, it did to me.