updated some settings files
updated submodules