misc minor tidying