do labels better, minor tidying