fixes, more debug log (15/22)