more debug tweaks