A few changes in the debug output.

And also in the documentation parser java code.