Tidied up a few more comments, etc.