Upgrading submodules and a few config tweaks
Upgrading submodules and a few fixes