Updates to submodules. Minor tweaks.