Fix CB comments, Drag/paint confusion, add TODO update task