some tidying up of various things