tidying and some additional comments.