Correcting mode and comments