Update to common and index, adding comments throughout