updated submodules
- Updated submodules
- Fixed some issues all around