Add a few comments, completion echo.