Stopped collecting datapoints that contain no location information. Added a couple of list comprehensions.