few more urls and cleanup