updates to them TODOs
cleaning up some of the stuff I don't need