Lots of conf changes; updated submodules