update with submodule fixes