adding more debug printouts
speeding up
adapting diff analysis