C0 coverage and improved comments