removed submodules; minor fixes