Just got in from working on it - done more tonight than in the last three weeks.

But yes, your point is noted, and one of these should be shown in my direction