Recovered some lost code + updated submodule