Better buffer switching
Updated submodules