Small fix, but mainly updated the TODO