cleanup; messy commit
fixing submodules