Updated TODO notes
auto-merge staging into master