make all-in less likely
add some debug output
Merge remote-tracking branch 'origin/master'