removed submodule, plus some updates