minor tidyings
stuff
Merge branch 'dev'