Updating submodules
Small tweaks and submodules update