xep-0280,0297: javadoc, remove debug, improve parser