variables cleanup and some submodule bumps