Fix up the TODO File a bit more