Some cleanups, updated submodules