Small improvements; updated submodules.