Allow for passing multiple URLs (not quite working yet); general cleanup