Improvements to comments