Various

tidying up etc