fixed a few bugs and updated submodules