Use CSV as default output. Add tests for CSV. Remove old commented out docs and code. Update some javadoc