[in progress! use master branch instead] updated TODOs
[in progress! use master branch instead] updated TODOs,