Fix zoom level, and some minor tidying