several minor tidies