Add comments, finally