Improved URL validation
Flake cleanup
Merge branch 'better_url_validation'