more debug toolbar rework stuff