updated Comments and a TODO