Just cleaning up TODOs that I have taken care of, and commenting things