Added submodules and small fix.