UK Puzzle Association

First draft text is my own (and is a bit rubbish):

Each angler outside the grid has caught one of the fish, and has a number showing how many grid squares their line passes through (this includes the square containing the fish). The lines can meander as much as is needed, but will only move from one square to the next through the centre of an edge, and can never visit a square they have already visited nor a square that is used by any other line.

Are the squares of the angler and the fish included in the count? On the Puzzle Picnic website, the fish squares are included (although the line goes not "through" the square), but the anglers are excluded (because they are outside of the diagram).

I've had a shot at it, but I think we can still do better.