I reckon this is done and any last tweaks are best re-assessed after the server move #478... But the new server kills off (3) and (7), above.