All correctly identified.
Finn and I have been enjoying a couple days away in Cardiff. I got myself an Explore Cardiff & Valleys day ranger to tick off a few lines I'd not travelled over before. The journeys were thus:
Cardiff QS - Penarth
Penarth - Grangetown
Grangetown - Bridgend
Bridgend - Maesteg
Maesteg - Cardiff Central
I had intended to go up one of the valleys after returning to Cardiff, but I was flagging a little by mid-afternoon.
The journey to Penarth was on one of the new(ish) Class 231s. Another example of the excellent and versatile Stadler FliRT family of multiple units. I really do hope we see FLiRTs in the Greater Western area in the not too distant future. They'd also make a great replacement for the SWR» (South Western Railway - about) Class 159 fleet which is approaching 35 years old.