tidying and minor updates