Fixing submodule
Updated build