adding todos
Minor fixes
Fixes