cleanup
update tests for url()
add comments