Update submodules, minor config file updates