tidying up, fixes