Tidying up and correcting comments