clean up some comments and imports, added some TODOs