Fixing and extending comments