Improvements to commenting, annotations.