Cleans up some old comments and adds some TODOs for future work