few more fixes and updated TODOs pre merge