Extras added to PCB, + tidying.
More tidying...