cleanup
overwrite url_generator
More documentation