Added stuff, updated submodules