Added some TODOs and comments