I agree with your thoughts, enrique.
Here's some of my random observations:
When Roz rang the doorbell, did Tim look out of the window briefly and see a car there? One that resembled Nick's?
Why was Hastings at the Tim murder scene?
Was Roz onto Kate from the start? What's Jodie up to? She looked very uncomfortable cautioning Hana. But why shouldn't she be expected to caution her?
Why did Hana look so calm after being run over, abducted, tied up in a burning house? Why was she interviewed straight away, before even being taken away in the ambulance? Couldn't Roz have waited?
What was Tim doing in the cafe? He looked at Hana, and harvested her fingerprint. What was he intending to do with it?
And I'm feeling uneasy about Kate. I don't know quite why. When she visited Steve in hospital, she looked worried; and she made a point of looking at the monitor. It was almost as if she didn't want him to survive! Her undercover doings were unconvincing too, I thought.
As regards Farmer, what did he mean when he said "if I do well, will I be looked after?". Who was "looking after" him? No wonder he looked upset and confused!