submodule upgrade & minor changes