And some more debug output readability improvements.