correct/incorrect fix and todo comment update