update some TODOs

anyone can do them :)