Updated submodules, and project depends on scottbase now