some tidying + whole job clicking etc.