more debug tweaking