more tidying up of stuff that will change substantially