Cleaned up script and added a URL handler dump