Bit more work done on comments.