Minor updates, some early CIDC stuff