dsb updates 00STUFF
tvw fixes tmb and dsb merge conflict