Comment fixes. Still working on draftlist