added more debug output
Merge branch 'nn-housekeeping'