fixup submodules and references