qdox update
big clean-up
towards new qdox-based model