updated submodules
merged submodule things