more debug fcts
debugging routines improved
fix conflict