added urls for star trek and added more list comprehensions