Add some TODOs and update some comments