Comment and annotation improvements