Manual screening update

Mostly changes to get manual screening working but some other tidying
as well