Fix submodules interference
Add todos
1.5.7