submodule fixes
Re-add public submodule