add some stuff that used to be in other submodules