Fuel tank question

[davidindevon]

Just in process of taking tank out to clean it out and filter and also replace the old fuel lines. (front lines in engine bay already done)
Was using some guide posted on forum (who forgot to unclip the wiring to fuel sender) but I'm amazed to find that much of mine is in different places - my fuel pump isn't in the off side wheel arch but in the centre of the car - being boiled by the exhaust!

Anyway my questions are...
does the Chimaera fuel tank have surge baffles in it?

what replacement fuel lines are preferred by folks and where is best supplier as I'll need to get something ordered up?

Thanks.

[Discopotatoes]

Yes the tank has baffles