finally fixing submodule issues