Some tidy-up of comments and version number to V1.6