Update submodules and some small changes