Minor improvements to comments etc.