Clean up some comments and add some TODOs.