comment edit and code correction