Improve documentation, clean up setup.xml