more cleanup and bug fixing to URLs app and other minor cleanup