oops, I forgot to uncomment this;
minor tidying-up;