attempted to fix my mess of submodules... again